From c792db26be916703a04ca0ce2c8dfdd53726f667 Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Mon, 18 Feb 2019 09:54:39 +0000 Subject: [PATCH] fix tracer calls --- C/prim_absmi_insts.h | 138 +++++++++++++++++++++---------------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/C/prim_absmi_insts.h b/C/prim_absmi_insts.h index fc10ba1a4..679e9df4f 100644 --- a/C/prim_absmi_insts.h +++ b/C/prim_absmi_insts.h @@ -1949,11 +1949,12 @@ Op(p_arg_vv, xxx); #ifdef LOW_LEVEL_TRACER if (Yap_do_low_level_trace) { - HR[0] = XREG(PREG->y_u.xxx.x1); - HR[1] = XREG(PREG->y_u.xxx.x2); - RESET_VARIABLE(HR + 2); + CELL HRs[3]; + HRs[0] = XREG(PREG->y_u.xxx.x1); + HRs[1] = XREG(PREG->y_u.xxx.x2); + HRs[2] = TermNil; low_level_trace(enter_pred, - RepPredProp(Yap_GetPredPropByFunc(FunctorArg, 0)), HR); + RepPredProp(Yap_GetPredPropByFunc(FunctorArg, 0)), HRs); } #endif /* LOW_LEVEL_TRACE */ BEGD(d0); @@ -2044,15 +2045,14 @@ Yap_AsmError( DOMAIN_ERROR_NOT_LESS_THAN_ZERO ); Op(p_arg_cv, xxn); #ifdef LOW_LEVEL_TRACER if (Yap_do_low_level_trace) { - CELL *Ho = HR; + CELL HRs[3]; Term t = MkIntegerTerm(PREG->y_u.xxn.c); - HR[0] = t; - HR[1] = XREG(PREG->y_u.xxn.xi); - RESET_VARIABLE(HR + 2); + HRs[0] = t; + HRs[1] = XREG(PREG->y_u.xxn.xi); + HRs[2] = TermFoundVar; low_level_trace(enter_pred, - RepPredProp(Yap_GetPredPropByFunc(FunctorArg, 0)), HR); - HR = Ho; - } + RepPredProp(Yap_GetPredPropByFunc(FunctorArg, 0)), HRs); + } #endif /* LOW_LEVEL_TRACE */ BEGD(d0); d0 = PREG->y_u.xxn.c; @@ -2118,12 +2118,13 @@ Yap_AsmError( DOMAIN_ERROR_NOT_LESS_THAN_ZERO ); Op(p_arg_y_vv, yxx); #ifdef LOW_LEVEL_TRACER if (Yap_do_low_level_trace) { - HR[0] = XREG(PREG->y_u.yxx.x1); - HR[1] = XREG(PREG->y_u.yxx.x2); - HR[2] = YREG[PREG->y_u.yxx.y]; - RESET_VARIABLE(HR + 2); - low_level_trace(enter_pred, - RepPredProp(Yap_GetPredPropByFunc(FunctorArg, 0)), HR); + CELL HRs[3]; + + HRs[0] = XREG(PREG->y_u.yxx.x1); + HRs[1] = XREG(PREG->y_u.yxx.x2); + HRs[2] = TermFoundVar; + low_level_trace(enter_pred, + RepPredProp(Yap_GetPredPropByFunc(FunctorArg, 0)), HRs); } #endif /* LOW_LEVEL_TRACE */ BEGD(d0); @@ -2215,15 +2216,13 @@ Yap_AsmError( DOMAIN_ERROR_NOT_LESS_THAN_ZERO ); Op(p_arg_y_cv, yxn); #ifdef LOW_LEVEL_TRACER if (Yap_do_low_level_trace) { - CELL *Ho = HR; + CELL HRs[3]; Term t = MkIntegerTerm(PREG->y_u.yxn.c); - HR[0] = t; - HR[1] = XREG(PREG->y_u.yxn.xi); - HR[2] = YREG[PREG->y_u.yxn.y]; - RESET_VARIABLE(HR + 2); + HRs[0] = t; + HRs[1] = XREG(PREG->y_u.yxn.xi); + HRs[2] = TermNil; low_level_trace(enter_pred, - RepPredProp(Yap_GetPredPropByFunc(FunctorArg, 0)), HR); - HR = Ho; + RepPredProp(Yap_GetPredPropByFunc(FunctorArg, 0)), HRs); } #endif /* LOW_LEVEL_TRACE */ BEGD(d0); @@ -2295,12 +2294,13 @@ Yap_AsmError( DOMAIN_ERROR_NOT_LESS_THAN_ZERO ); restart_func2s: #ifdef LOW_LEVEL_TRACER if (Yap_do_low_level_trace) { - RESET_VARIABLE(HR); - HR[1] = XREG(PREG->y_u.xxx.x1); - HR[2] = XREG(PREG->y_u.xxx.x2); + CELL HRs[3]; + HRs[0] = TermNil; + HRs[1] = XREG(PREG->y_u.xxx.x1); + HRs[2] = XREG(PREG->y_u.xxx.x2); low_level_trace(enter_pred, RepPredProp(Yap_GetPredPropByFunc(FunctorFunctor, 0)), - HR); + HRs); } #endif /* LOW_LEVEL_TRACE */ /* We have to build the structure */ @@ -2412,12 +2412,13 @@ Yap_AsmError( DOMAIN_ERROR_NOT_LESS_THAN_ZERO ); restart_func2s_cv: #ifdef LOW_LEVEL_TRACER if (Yap_do_low_level_trace) { - RESET_VARIABLE(HR); - HR[1] = PREG->y_u.xxc.c; - HR[2] = XREG(PREG->y_u.xxc.xi); + CELL HRs[3]; + HRs[0] = TermNil; + HRs[1] = PREG->y_u.xxc.c; + HRs[2] = XREG(PREG->y_u.xxc.xi); low_level_trace(enter_pred, RepPredProp(Yap_GetPredPropByFunc(FunctorFunctor, 0)), - HR); + HRs); } #endif /* LOW_LEVEL_TRACE */ BEGD(d0); @@ -2517,16 +2518,14 @@ Yap_AsmError( DOMAIN_ERROR_NOT_LESS_THAN_ZERO ); #ifdef LOW_LEVEL_TRACER if (Yap_do_low_level_trace) { Term ti; - CELL *hi = HR; - + CELL HRs[3]; + HRs[0] = TermNil; ti = MkIntegerTerm(PREG->y_u.xxn.c); - RESET_VARIABLE(HR); - HR[1] = XREG(PREG->y_u.xxn.xi); - HR[2] = ti; + HRs[1] = XREG(PREG->y_u.xxn.xi); + HRs[2] = ti; low_level_trace(enter_pred, RepPredProp(Yap_GetPredPropByFunc(FunctorFunctor, 0)), - HR); - HR = hi; + HRs); } #endif /* LOW_LEVEL_TRACE */ /* We have to build the structure */ @@ -2611,12 +2610,13 @@ Yap_AsmError( DOMAIN_ERROR_NOT_LESS_THAN_ZERO ); restart_func2s_y: #ifdef LOW_LEVEL_TRACER if (Yap_do_low_level_trace) { - RESET_VARIABLE(HR); - HR[1] = XREG(PREG->y_u.yxx.x1); - HR[2] = XREG(PREG->y_u.yxx.x2); + CELL HRs[3]; + HRs[0] = TermNil; + HRs[1] = XREG(PREG->y_u.yxx.x1); + HRs[2] = XREG(PREG->y_u.yxx.x2); low_level_trace(enter_pred, RepPredProp(Yap_GetPredPropByFunc(FunctorFunctor, 0)), - HR); + HRs); } #endif /* LOW_LEVEL_TRACE */ /* We have to build the structure */ @@ -2735,12 +2735,13 @@ Yap_AsmError( DOMAIN_ERROR_NOT_LESS_THAN_ZERO ); restart_func2s_y_cv: #ifdef LOW_LEVEL_TRACER if (Yap_do_low_level_trace) { - RESET_VARIABLE(HR); - HR[1] = PREG->y_u.yxc.c; - HR[2] = XREG(PREG->y_u.yxc.xi); + CELL HRs[3]; + HRs[0] = TermNil; + HRs[1] = PREG->y_u.yxc.c; + HRs[2] = XREG(PREG->y_u.yxc.xi); low_level_trace(enter_pred, RepPredProp(Yap_GetPredPropByFunc(FunctorFunctor, 0)), - HR); + HRs); } #endif /* LOW_LEVEL_TRACE */ /* We have to build the structure */ @@ -2846,16 +2847,15 @@ Yap_AsmError( DOMAIN_ERROR_NOT_LESS_THAN_ZERO ); #ifdef LOW_LEVEL_TRACER if (Yap_do_low_level_trace) { Term ti; - CELL *hi = HR; + CELL HRs[3]; ti = MkIntegerTerm((Int)(PREG->y_u.yxn.c)); - RESET_VARIABLE(HR); - HR[1] = XREG(PREG->y_u.yxn.xi); - HR[2] = ti; + HRs[0] = TermFoundVar; + HRs[1] = XREG(PREG->y_u.yxn.xi); + HRs[2] = ti; low_level_trace(enter_pred, RepPredProp(Yap_GetPredPropByFunc(FunctorFunctor, 0)), - HR); - HR = hi; + HRs); } #endif /* LOW_LEVEL_TRACE */ /* We have to build the structure */ @@ -2952,12 +2952,12 @@ Yap_AsmError( DOMAIN_ERROR_NOT_LESS_THAN_ZERO ); Op(p_func2f_xx, xxx); #ifdef LOW_LEVEL_TRACER if (Yap_do_low_level_trace) { - HR[0] = XREG(PREG->y_u.xxx.x); - RESET_VARIABLE(HR + 1); - RESET_VARIABLE(HR + 2); + Term HRs[3]; + HRs[0] = XREG(PREG->y_u.xxx.x); + HRs[1] = HRs[2] = TermFoundVar; low_level_trace(enter_pred, RepPredProp(Yap_GetPredPropByFunc(FunctorFunctor, 0)), - HR); + HRs); } #endif /* LOW_LEVEL_TRACE */ BEGD(d0); @@ -3000,12 +3000,12 @@ Yap_AsmError( DOMAIN_ERROR_NOT_LESS_THAN_ZERO ); Op(p_func2f_xy, xxy); #ifdef LOW_LEVEL_TRACER if (Yap_do_low_level_trace) { - HR[0] = XREG(PREG->y_u.xxy.x); - RESET_VARIABLE(HR + 1); - RESET_VARIABLE(HR + 2); + Term HRs[3]; + HRs[0] = XREG(PREG->y_u.xxy.x); + HRs[1] = HRs[2] = TermFoundVar; low_level_trace(enter_pred, RepPredProp(Yap_GetPredPropByFunc(FunctorFunctor, 0)), - HR); + HRs); } #endif /* LOW_LEVEL_TRACE */ BEGD(d0); @@ -3051,12 +3051,12 @@ Yap_AsmError( DOMAIN_ERROR_NOT_LESS_THAN_ZERO ); Op(p_func2f_yx, yxx); #ifdef LOW_LEVEL_TRACER if (Yap_do_low_level_trace) { - HR[0] = XREG(PREG->y_u.yxx.x2); - RESET_VARIABLE(HR + 1); - RESET_VARIABLE(HR + 2); + Term HRs[3]; + HRs[0] = XREG(PREG->y_u.yxx.x2); + HRs[1] = HRs[2] = TermFoundVar; low_level_trace(enter_pred, RepPredProp(Yap_GetPredPropByFunc(FunctorFunctor, 0)), - HR); + HRs); } #endif /* LOW_LEVEL_TRACE */ BEGD(d0); @@ -3102,12 +3102,12 @@ Yap_AsmError( DOMAIN_ERROR_NOT_LESS_THAN_ZERO ); Op(p_func2f_yy, yyx); #ifdef LOW_LEVEL_TRACER if (Yap_do_low_level_trace) { - HR[0] = XREG(PREG->y_u.yyx.x); - RESET_VARIABLE(HR + 1); - RESET_VARIABLE(HR + 2); + CELL HRs[3]; + HRs[0] = XREG(PREG->y_u.yyx.x); + HRs[1] = HRs[2] = TermFoundVar; low_level_trace(enter_pred, RepPredProp(Yap_GetPredPropByFunc(FunctorFunctor, 0)), - HR); + HRs); } #endif /* LOW_LEVEL_TRACE */ BEGD(d0);