Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3
This commit is contained in:
commit
8c5a87d389
@ -379,7 +379,7 @@ InitExStacks(int Trail, int Stack)
|
||||
AuxSp = NULL;
|
||||
|
||||
#ifdef DEBUG
|
||||
if (GLOBAL_output_msg) {
|
||||
if (Yap_output_msg) {
|
||||
UInt ta;
|
||||
|
||||
fprintf(stderr, "HeapBase = %p GlobalBase = %p\n LocalBase = %p TrailTop = %p\n",
|
||||
@ -1534,11 +1534,11 @@ Yap_InitMemory(UInt Trail, UInt Heap, UInt Stack)
|
||||
|
||||
#ifdef DEBUG
|
||||
#if SIZEOF_INT_P!=SIZEOF_INT
|
||||
if (GLOBAL_output_msg) {
|
||||
if (Yap_output_msg) {
|
||||
fprintf(stderr, "HeapBase = %p GlobalBase = %p\n LocalBase = %p TrailTop = %p\n",
|
||||
Yap_HeapBase, LOCAL_GlobalBase, LOCAL_LocalBase, LOCAL_TrailTop);
|
||||
#else
|
||||
if (GLOBAL_output_msg) {
|
||||
if (Yap_output_msg) {
|
||||
fprintf(stderr, "HeapBase = %x GlobalBase = %x\n LocalBase = %x TrailTop = %x\n",
|
||||
(UInt) Yap_HeapBase, (UInt) LOCAL_GlobalBase,
|
||||
(UInt) LOCAL_LocalBase, (UInt) LOCAL_TrailTop);
|
||||
|
@ -3076,7 +3076,7 @@ X_API void
|
||||
YAP_SetOutputMessage(void)
|
||||
{
|
||||
#if DEBUG
|
||||
GLOBAL_output_msg = TRUE;
|
||||
Yap_output_msg = TRUE;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
3
C/init.c
3
C/init.c
@ -58,6 +58,7 @@ static char SccsId[] = "%W% %G%";
|
||||
|
||||
#define LOGFILE "logfile"
|
||||
|
||||
int Yap_output_msg = FALSE;
|
||||
|
||||
#ifdef MACC
|
||||
STATIC_PROTO(void InTTYLine, (char *));
|
||||
@ -344,7 +345,7 @@ InitDebug(void)
|
||||
|
||||
for (i = 1; i < 20; ++i)
|
||||
GLOBAL_Option[i] = 0;
|
||||
if (GLOBAL_output_msg) {
|
||||
if (Yap_output_msg) {
|
||||
char ch;
|
||||
|
||||
#if HAVE_ISATTY
|
||||
|
7
H/Yap.h
7
H/Yap.h
@ -760,6 +760,13 @@ extern ADDR Yap_HeapBase;
|
||||
|
||||
#define MAX_ERROR_MSG_SIZE YAP_FILENAME_MAX
|
||||
|
||||
/*************************************************************************************************
|
||||
Debugging Support
|
||||
*************************************************************************************************/
|
||||
|
||||
#ifdef DEBUG
|
||||
extern int Yap_output_msg;
|
||||
#endif
|
||||
|
||||
/*************************************************************************************************
|
||||
???
|
||||
|
@ -85,7 +85,7 @@
|
||||
#define GLOBAL_Option Yap_global->Option_
|
||||
#define GLOBAL_logfile Yap_global->logfile_
|
||||
|
||||
#define GLOBAL_output_msg Yap_global->output_msg_
|
||||
|
||||
#endif
|
||||
|
||||
#define GLOBAL_ProfCalls Yap_global->ProfCalls_
|
||||
|
@ -85,7 +85,7 @@ typedef struct global_data {
|
||||
char Option_[20];
|
||||
YP_FILE* logfile_;
|
||||
|
||||
int output_msg_;
|
||||
|
||||
#endif
|
||||
|
||||
Int ProfCalls_;
|
||||
|
@ -85,7 +85,7 @@ static void InitGlobal(void) {
|
||||
|
||||
|
||||
|
||||
GLOBAL_output_msg = FALSE;
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
@ -100,7 +100,7 @@ struct MMAP_ARRAY_BLOCK* mmap_arrays =NULL
|
||||
char Option[20] void
|
||||
YP_FILE* logfile void
|
||||
//init.c
|
||||
int output_msg =FALSE
|
||||
//int output_msg =FALSE
|
||||
#endif
|
||||
|
||||
//gprof.c
|
||||
|
Reference in New Issue
Block a user