thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Moved (kernel) debug stuff from tools.cpp to a new file engine/kdebug.cpp

Browse source 
svn-id: r38867
This commit is contained in:
Max Horn 2009-02-24 22:41:58 +00:00
parent e7b0c975d9
commit 595c655766
4 changed files with 79 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

73
engines/sci/engine/kdebug.cpp Normal file
View file

@ -0,0 +1,73 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $URL$
* $Id$
*
*/
#include "common/scummsys.h"
#include "sci/engine/kdebug.h"
#include "sci/include/engine.h"
namespace Sci {
int script_debug_flag = 0; // Defaulting to running mode
int sci_debug_flags = 0; // Special flags
// Functions for internal macro use
void _SCIkvprintf(FILE *file, const char *format, va_list args);
void _SCIkvprintf(FILE *file, const char *format, va_list args) {
vfprintf(file, format, args);
if (con_file) vfprintf(con_file, format, args);
}
void _SCIkwarn(EngineState *s, const char *file, int line, int area, const char *format, ...) {
va_list args;
if (area == SCIkERROR_NR)
fprintf(stderr, "ERROR: ");
else
fprintf(stderr, "Warning: ");
va_start(args, format);
_SCIkvprintf(stderr, format, args);
va_end(args);
fflush(NULL);
if (sci_debug_flags & _DEBUG_FLAG_BREAK_ON_WARNINGS) script_debug_flag = 1;
}
void _SCIkdebug(EngineState *s, const char *file, int line, int area, const char *format, ...) {
va_list args;
if (s->debug_mode & (1 << area)) {
fprintf(stdout, " kernel: (%s L%d): ", file, line);
va_start(args, format);
_SCIkvprintf(stdout, format, args);
va_end(args);
fflush(NULL);
}
}
} // End of namespace Sci

8
engines/sci/engine/kdebug.h
View file

@ -62,14 +62,10 @@ struct EngineState;
#define SCI_KERNEL_DEBUG
#ifdef SCI_KERNEL_DEBUG
#define SCIkdebug _SCIkdebug
#else /* !SCI_KERNEL_DEBUG */
#else
#define SCIkdebug 1? (void)0 : _SCIkdebug
#endif /* !SCI_KERNEL_DEBUG */
#endif
#define SCIkwarn _SCIkwarn

1
engines/sci/module.mk
View file

@ -12,6 +12,7 @@ MODULE_OBJS = \
engine/gc.o \
engine/grammar.o \
engine/intmap.o \
engine/kdebug.o \
engine/kernel.o \
engine/kevent.o \
engine/kfile.o \

54
engines/sci/tools.cpp
View file

@ -23,23 +23,10 @@
*
*/
#include "common/scummsys.h"
#include "common/util.h"
#include "common/str.h"
#include "sci/include/engine.h"
#include "sci/engine/kernel.h"
#include "sci/tools.h"
namespace Sci {
int script_debug_flag = 0; // Defaulting to running mode
int sci_debug_flags = 0; // Special flags
#ifndef con_file
# define con_file 0
#endif
int sci_ffs(int _mask) {
int retval = 0;
@ -54,43 +41,4 @@ int sci_ffs(int _mask) {
return retval;
}
//******************* Debug functions *******************
// Functions for internal macro use
void _SCIkvprintf(FILE *file, const char *format, va_list args);
void _SCIkvprintf(FILE *file, const char *format, va_list args) {
vfprintf(file, format, args);
if (con_file) vfprintf(con_file, format, args);
}
void _SCIkwarn(EngineState *s, const char *file, int line, int area, const char *format, ...) {
va_list args;
if (area == SCIkERROR_NR)
fprintf(stderr, "ERROR: ");
else
fprintf(stderr, "Warning: ");
va_start(args, format);
_SCIkvprintf(stderr, format, args);
va_end(args);
fflush(NULL);
if (sci_debug_flags & _DEBUG_FLAG_BREAK_ON_WARNINGS) script_debug_flag = 1;
}
void _SCIkdebug(EngineState *s, const char *file, int line, int area, const char *format, ...) {
va_list args;
if (s->debug_mode & (1 << area)) {
fprintf(stdout, " kernel: (%s L%d): ", file, line);
va_start(args, format);
_SCIkvprintf(stdout, format, args);
va_end(args);
fflush(NULL);
}
}
} // End of namespace Sci