diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix C/scanner.c. change some misc/LOCALS initializations.

Browse Source
This commit is contained in:
Joao 2011-05-26 15:02:00 +01:00
parent 98e35b16e8
commit f658a99dad
5 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
C/init.c
View File

@ -1097,6 +1097,7 @@ void init_yapor_workers(void) {
worker_id = proc; worker_id = proc;
Yap_remap_optyap_memory(); Yap_remap_optyap_memory();
LOCAL = REMOTE(worker_id); LOCAL = REMOTE(worker_id);
memcpy(REMOTE(worker_id),REMOTE(0),sizeof(struct worker_local));
InitWorker(worker_id); InitWorker(worker_id);
break; break;
} else } else

12
C/scanner.c
View File

@ -855,9 +855,9 @@ Yap_tokenizer(IOSTREAM *inp_stream, Term *tposp)
ch = getchr(inp_stream); ch = getchr(inp_stream);
} }
if (ASP-H < 1024) { if (ASP-H < 1024) {
Yap_ErrorMessage = "Stack Overflow"; LOCAL_ErrorMessage = "Stack Overflow";
Yap_Error_TYPE = OUT_OF_STACK_ERROR; LOCAL_Error_TYPE = OUT_OF_STACK_ERROR;
Yap_Error_Size = 0L; LOCAL_Error_Size = 0L;
if (p) if (p)
p->Tok = Ord(kind = eot_tok); p->Tok = Ord(kind = eot_tok);
/* serious error now */ /* serious error now */
@ -1171,9 +1171,9 @@ Yap_tokenizer(IOSTREAM *inp_stream, Term *tposp)
ch = getchr(inp_stream); ch = getchr(inp_stream);
} }
if (ASP-H < 1024) { if (ASP-H < 1024) {
Yap_ErrorMessage = "Stack Overflow"; LOCAL_ErrorMessage = "Stack Overflow";
Yap_Error_TYPE = OUT_OF_STACK_ERROR; LOCAL_Error_TYPE = OUT_OF_STACK_ERROR;
Yap_Error_Size = 0L; LOCAL_Error_Size = 0L;
if (p) if (p)
p->Tok = Ord(kind = eot_tok); p->Tok = Ord(kind = eot_tok);
/* serious error now */ /* serious error now */

26
H/ilocals.h
View File

@ -129,24 +129,24 @@ static void InitWorker(int wid) {
INIT_LOCK(REMOTE_SignalLock(wid)); INIT_LOCK(REMOTE_SignalLock(wid));
#endif #endif
REMOTE_LocalBase(wid) = REMOTE_LocalBase(0);
REMOTE_GlobalBase(wid) = REMOTE_GlobalBase(0);
REMOTE_TrailBase(wid) = REMOTE_TrailBase(0);
REMOTE_TrailTop(wid) = REMOTE_TrailTop(0);
REMOTE_ErrorMessage(wid) = REMOTE_ErrorMessage(0);
REMOTE_Error_Term(wid) = REMOTE_Error_Term(0);
#ifdef THREADS #ifdef THREADS
REMOTE_Error_TYPE(wid) = REMOTE_Error_TYPE(0);
#else #else
REMOTE_Error_TYPE(wid) = REMOTE_Error_TYPE(0);
#endif #endif
REMOTE_Error_Size(wid) = REMOTE_Error_Size(0);
REMOTE_tokptr(wid) = REMOTE_tokptr(0);
REMOTE_toktide(wid) = REMOTE_toktide(0);
REMOTE_VarTable(wid) = REMOTE_VarTable(0);
REMOTE_AnonVarTable(wid) = REMOTE_AnonVarTable(0);

26
misc/LOCALS
View File

@ -146,24 +146,24 @@ lockvar SignalLock MkLock
#endif #endif
// Variables related to memory allocation // Variables related to memory allocation
ADDR LocalBase =REMOTE_LocalBase(0) ADDR LocalBase void
ADDR GlobalBase =REMOTE_GlobalBase(0) ADDR GlobalBase void
ADDR TrailBase =REMOTE_TrailBase(0) ADDR TrailBase void
ADDR TrailTop =REMOTE_TrailTop(0) ADDR TrailTop void
char* ErrorMessage =REMOTE_ErrorMessage(0) char* ErrorMessage void
Term Error_Term =REMOTE_Error_Term(0) Term Error_Term void
#ifdef THREADS #ifdef THREADS
Term Error_TYPE =REMOTE_Error_TYPE(0) Term Error_TYPE void
#else #else
yap_error_number Error_TYPE =REMOTE_Error_TYPE(0) yap_error_number Error_TYPE void
#endif #endif
UInt Error_Size =REMOTE_Error_Size(0) UInt Error_Size void
char ErrorSay[MAX_ERROR_MSG_SIZE] void char ErrorSay[MAX_ERROR_MSG_SIZE] void
jmp_buf IOBotch void jmp_buf IOBotch void
TokEntry* tokptr =REMOTE_tokptr(0) TokEntry* tokptr void
TokEntry* toktide =REMOTE_toktide(0) TokEntry* toktide void
VarEntry* VarTable =REMOTE_VarTable(0) VarEntry* VarTable void
VarEntry* AnonVarTable =REMOTE_AnonVarTable(0) VarEntry* AnonVarTable void
sigjmp_buf RestartEnv void sigjmp_buf RestartEnv void
char FileNameBuf[YAP_FILENAME_MAX] void char FileNameBuf[YAP_FILENAME_MAX] void
char FileNameBuf2[YAP_FILENAME_MAX] void char FileNameBuf2[YAP_FILENAME_MAX] void

2
packages/chr

@ -1 +1 @@
Subproject commit b2eb894ce3e41925070215f800d6df3a356dc29d Subproject commit bf6525f85cfcf3c08fff8cf91fb189fe71dc34fd