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

Cosmetic changes

This commit is contained in:
Vítor Santos Costa 2015-04-13 13:14:36 +01:00
parent 756a79995b
commit 00c58f5572
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
C/absmi.c
View File

@ -1260,7 +1260,7 @@ interrupt_either( USES_REGS1 )
} }
//P = NEXTOP(P, Osblp); //P = NEXTOP(P, Osblp);
if ((v = stack_overflow(RepPredProp(Yap_GetPredPropByFunc(FunctorRestoreRegs1,0)), YENV, NEXTOP(P,Osblp) PASS_REGS )) >= 0) { if ((v = stack_overflow(RepPredProp(Yap_GetPredPropByFunc(FunctorRestoreRegs1,0)), YENV, NEXTOP(P,Osblp) PASS_REGS )) >= 0) {
//P = PREVOP(P, Osblp); //P = PREVOP(P, Osblp);
return v; return v;
} }
// P = PREVOP(P, Osblp); // P = PREVOP(P, Osblp);
@ -1595,7 +1595,7 @@ Yap_absmi(int inp)
#define I_R (XREGS[0]) #define I_R (XREGS[0])
#if YAP_JIT #if YAP_JIT
Yap_ExpEnvP = & Yap_ExpEnv; Yap_ExpEnvP = & Yap_ExpEnv;
static void *control_labels[] = { &&fail, &&NoStackCut, &&NoStackCommitY, &&NoStackCutT, &&NoStackEither, &&NoStackExecute, &&NoStackCall, &&NoStackDExecute, &&NoStackDeallocate, &&notrailleft, &&NoStackFail, &&NoStackCommitX }; static void *control_labels[] = { &&fail, &&NoStackCut, &&NoStackCommitY, &&NoStackCutT, &&NoStackEither, &&NoStackExecute, &&NoStackCall, &&NoStackDExecute, &&NoStackDeallocate, &&notrailleft, &&NoStackFail, &&NoStackCommitX };
curtrace = NULL; curtrace = NULL;
curpreg = NULL; curpreg = NULL;
@ -1627,7 +1627,7 @@ Yap_absmi(int inp)
nnexec = 0; nnexec = 0;
l = 0; l = 0;
#endif /* YAP_JIT */ #endif /* YAP_JIT */
#if USE_THREADED_CODE #if USE_THREADED_CODE
/************************************************************************/ /************************************************************************/
/* Abstract Machine Instruction Address Table */ /* Abstract Machine Instruction Address Table */
@ -1645,15 +1645,15 @@ Yap_absmi(int inp)
ExpEnv.config_struc.TOTAL_OF_OPCODES = ExpEnv.config_struc.TOTAL_OF_OPCODES =
sizeof(OpAddress)/(2*sizeof(void*)); sizeof(OpAddress)/(2*sizeof(void*));
#endif #endif
#endif /* USE_THREADED_CODE */ #endif /* USE_THREADED_CODE */
/*static void* (*nat_glist_valx)(yamop**,yamop**,CELL**,void**,int*); /*static void* (*nat_glist_valx)(yamop**,yamop**,CELL**,void**,int*);
if (nat_glist_valx == NULL) { if (nat_glist_valx == NULL) {
nat_glist_valx = (void*(*)(yamop**,yamop**,CELL**,void**,int*))call_JIT_Compiler(J, _glist_valx); nat_glist_valx = (void*(*)(yamop**,yamop**,CELL**,void**,int*))call_JIT_Compiler(J, _glist_valx);
}*/ }*/
#ifdef SHADOW_REGS #ifdef SHADOW_REGS
/* work with a local pointer to the registers */ /* work with a local pointer to the registers */
@ -1749,6 +1749,8 @@ Yap_absmi(int inp)
SP = SP0; SP = SP0;
#if USE_THREADED_CODE #if USE_THREADED_CODE
//___androidlog_print(ANDROID_LOG_INFO, "YAP ", "%s", Yap_op_names[Yap_op_from_opcode(PREG->opc)]);
JMPNext(); /* go execute instruction at P */ JMPNext(); /* go execute instruction at P */
#else #else
@ -1827,7 +1829,7 @@ Yap_absmi(int inp)
// so that they are easier to analyse. // so that they are easier to analyse.
#include "absmi_insts.h" #include "absmi_insts.h"
#if !USE_THREADED_CODE #if !USE_THREADED_CODE
default: default:
saveregs(); saveregs();