remove-args-from-DISASM_RT.patch

   1 ---
   2
   3  source/interpret.c |  100 ++++++++++++++++++++++++++++-------------------------
   4  1 file changed, 54 insertions(+), 46 deletions(-)
   5
   6 diff --quilt old/source/interpret.c new/source/interpret.c
   7 --- old/source/interpret.c
   8 +++ new/source/interpret.c
   9 @@ -136,10 +136,10 @@ static void disasmInternal(Inst *inst, i
  10  static void stackdump(int n, int extra);
  11  static void stackdumpInternal(int n, int extra);
  12  #define STACKDUMP(n, x) stackdump(n, x)
  13 -#define DISASM_RT(i, n) disasm(NULL, i, n)
  14 +#define DISASM_RT() disasm(NULL, PC - 1, 1)
  15  #else /* #ifndef DEBUG_STACK */
  16  #define STACKDUMP(n, x)
  17 -#define DISASM_RT(i, n)
  18 +#define DISASM_RT()
  19  #endif /* #ifndef DEBUG_STACK */
  20
  21  /* Global symbols and function definitions, is null initialized */
  22 @@ -1549,7 +1549,7 @@ static void addToGlobalSymTab(Symbol *sy
  23  #define BINARY_NUMERIC_OPERATION(operator) \
  24      do { \
  25          int n1, n2; \
  26 -        DISASM_RT(PC-1, 1); \
  27 +        DISASM_RT(); \
  28          STACKDUMP(2, 3); \
  29          POP_INT(n2); \
  30          POP_INT(n1); \
  31 @@ -1560,7 +1560,7 @@ static void addToGlobalSymTab(Symbol *sy
  32  #define UNARY_NUMERIC_OPERATION(operator) \
  33      do { \
  34          int n; \
  35 -        DISASM_RT(PC-1, 1); \
  36 +        DISASM_RT(); \
  37          STACKDUMP(1, 3); \
  38          POP_INT(n); \
  39          PUSH_INT(operator n); \
  40 @@ -1580,7 +1580,7 @@ static int pushSymVal(void)
  41      int nArgs, argNum;
  42      DataValue symVal;
  43
  44 -    DISASM_RT(PC-1, 2);
  45 +    DISASM_RT();
  46      STACKDUMP(0, 3);
  47
  48      GET_SYM(s);
  49 @@ -1635,7 +1635,7 @@ static int pushImmed(void)
  50  {
  51      int immed;
  52
  53 -    DISASM_RT(PC-1, 2);
  54 +    DISASM_RT();
  55      STACKDUMP(0, 3);
  56
  57      GET_IMMED(immed);
  58 @@ -1649,7 +1649,7 @@ static int pushArgVal(void)
  59  {
  60      int nArgs, argNum;
  61
  62 -    DISASM_RT(PC-1, 1);
  63 +    DISASM_RT();
  64      STACKDUMP(1, 3);
  65
  66      POP_INT(argNum);
  67 @@ -1665,7 +1665,7 @@ static int pushArgVal(void)
  68
  69  static int pushArgCount(void)
  70  {
  71 -    DISASM_RT(PC-1, 1);
  72 +    DISASM_RT();
  73      STACKDUMP(0, 3);
  74
  75      PUSH_INT(FP_GET_ARG_COUNT(FrameP));
  76 @@ -1678,7 +1678,7 @@ static int pushArgArray(void)
  77      DataValue argVal, *argArray;
  78      Boolean needArgCopy = False;
  79
  80 -    DISASM_RT(PC-1, 1);
  81 +    DISASM_RT();
  82      STACKDUMP(0, 3);
  83
  84      nArgs = FP_GET_ARG_COUNT(FrameP);
  85 @@ -1719,7 +1719,7 @@ static int pushArraySymVal(void)
  86      DataValue *dataPtr;
  87      int initEmpty;
  88
  89 -    DISASM_RT(PC-1, 3);
  90 +    DISASM_RT();
  91      STACKDUMP(0, 3);
  92
  93      GET_SYM(sym);
  94 @@ -1762,7 +1762,7 @@ static int anonArrayOpen(void)
  95  {
  96      DataValue dataVal;
  97
  98 -    DISASM_RT(PC-1, 1);
  99 +    DISASM_RT();
 100      STACKDUMP(0, 3);
 101
 102      /* make an empty array */
 103 @@ -1793,7 +1793,7 @@ static int anonArraySkip(void)
 104      DataValue anonArray;
 105      int nextIndex;
 106
 107 -    DISASM_RT(PC-1, 1);
 108 +    DISASM_RT();
 109      STACKDUMP(2, 3);
 110
 111      POP(anonArray);
 112 @@ -1825,7 +1825,7 @@ static int anonArrayNextVal(void)
 113      int nextIndex;
 114      char numString[TYPE_INT_STR_SIZE(int)];
 115
 116 -    DISASM_RT(PC-1, 1);
 117 +    DISASM_RT();
 118      STACKDUMP(3, 3);
 119
 120      POP(exprVal);
 121 @@ -1862,9 +1862,10 @@ static int anonArrayIndexVal(void)
 122      int nextIndex, index;
 123      int nDim;
 124
 125 +    DISASM_RT();
 126 +
 127      GET_IMMED(nDim);
 128
 129 -    DISASM_RT(PC-2, 2);
 130      STACKDUMP(nDim+3, 3);
 131
 132      POP(exprVal);
 133 @@ -1909,7 +1910,7 @@ static int anonArrayClose(void)
 134      DataValue anonArray;
 135      DataValue next_index;
 136
 137 -    DISASM_RT(PC-1, 1);
 138 +    DISASM_RT();
 139      STACKDUMP(2, 3);
 140
 141      /* remove top two elements */
 142 @@ -1959,9 +1960,10 @@ static int namedArg1orN(Boolean isFirst)
 143      DataValue exprVal, argsArray;
 144      int nDim, index;
 145
 146 +    DISASM_RT();
 147 +
 148      GET_IMMED(nDim);
 149
 150 -    DISASM_RT(PC-2, 2);
 151      STACKDUMP(nDim + (isFirst ? 2 : 1), 3);
 152
 153      POP(exprVal);
 154 @@ -2005,7 +2007,7 @@ static int swapTop2(void)
 155  {
 156      DataValue dv1, dv2;
 157
 158 -    DISASM_RT(PC-1, 1);
 159 +    DISASM_RT();
 160      STACKDUMP(2, 3);
 161
 162      POP(dv1);
 163 @@ -2030,7 +2032,7 @@ static int assign(void)
 164      DataValue *dataPtr;
 165      DataValue value;
 166
 167 -    DISASM_RT(PC-1, 2);
 168 +    DISASM_RT();
 169      STACKDUMP(1, 3);
 170
 171      GET_SYM(sym);
 172 @@ -2077,7 +2079,7 @@ static int popStack(void)
 173  {
 174      DataValue val;
 175
 176 -    DISASM_RT(PC-1, 1);
 177 +    DISASM_RT();
 178      STACKDUMP(1, 4);
 179
 180      POP(val);
 181 @@ -2094,7 +2096,7 @@ static int dupStack(void)
 182  {
 183      DataValue value;
 184
 185 -    DISASM_RT(PC-1, 1);
 186 +    DISASM_RT();
 187      STACKDUMP(1, 3);
 188
 189      PEEK(value, 0);
 190 @@ -2116,7 +2118,7 @@ static int add(void)
 191      DataValue leftVal, rightVal, resultArray;
 192      int n1, n2;
 193
 194 -    DISASM_RT(PC-1, 1);
 195 +    DISASM_RT();
 196      STACKDUMP(2, 3);
 197
 198      PEEK(rightVal, 0);
 199 @@ -2188,7 +2190,7 @@ static int subtract(void)
 200      DataValue leftVal, rightVal, resultArray;
 201      int n1, n2;
 202
 203 -    DISASM_RT(PC-1, 1);
 204 +    DISASM_RT();
 205      STACKDUMP(2, 3);
 206
 207      PEEK(rightVal, 0);
 208 @@ -2260,7 +2262,7 @@ static int divide(void)
 209  {
 210      int n1, n2;
 211
 212 -    DISASM_RT(PC-1, 1);
 213 +    DISASM_RT();
 214      STACKDUMP(2, 3);
 215
 216      POP_INT(n2);
 217 @@ -2276,7 +2278,7 @@ static int modulo(void)
 218  {
 219      int n1, n2;
 220
 221 -    DISASM_RT(PC-1, 1);
 222 +    DISASM_RT();
 223      STACKDUMP(2, 3);
 224
 225      POP_INT(n2);
 226 @@ -2333,7 +2335,7 @@ static int eq(void)
 227  {
 228      DataValue v1, v2;
 229
 230 -    DISASM_RT(PC-1, 1);
 231 +    DISASM_RT();
 232      STACKDUMP(2, 3);
 233
 234      POP(v1);
 235 @@ -2389,7 +2391,7 @@ static int bitAnd(void)
 236      DataValue leftVal, rightVal, resultArray;
 237      int n1, n2;
 238
 239 -    DISASM_RT(PC-1, 1);
 240 +    DISASM_RT();
 241      STACKDUMP(2, 3);
 242
 243      PEEK(rightVal, 0);
 244 @@ -2449,7 +2451,7 @@ static int bitOr(void)
 245      DataValue leftVal, rightVal, resultArray;
 246      int n1, n2;
 247
 248 -    DISASM_RT(PC-1, 1);
 249 +    DISASM_RT();
 250      STACKDUMP(2, 3);
 251
 252      PEEK(rightVal, 0);
 253 @@ -2532,7 +2534,7 @@ static int power(void)
 254  {
 255      int n1, n2, n3;
 256
 257 -    DISASM_RT(PC-1, 1);
 258 +    DISASM_RT();
 259      STACKDUMP(2, 3);
 260
 261      POP_INT(n2);
 262 @@ -2656,9 +2658,10 @@ static int concat(void)
 263
 264      int nExpr;
 265
 266 +    DISASM_RT();
 267 +
 268      GET_IMMED(nExpr);
 269
 270 -    DISASM_RT(PC-2, 2);
 271      STACKDUMP(nExpr, 3);
 272
 273      /* remember: concatenateNwithSep() succeeds with a non-positive number */
 274 @@ -2829,10 +2832,11 @@ static int callSubroutine(void)
 275      Symbol *sym;
 276      int nArgs;
 277
 278 +    DISASM_RT();
 279 +
 280      GET_SYM(sym);
 281      GET_IMMED(nArgs);
 282
 283 -    DISASM_RT(PC-3, 3);
 284      STACKDUMP(nArgs > 0 ? nArgs : -nArgs, 3);
 285
 286      return callSubroutineFromSymbol(sym, nArgs);
 287 @@ -2866,7 +2870,7 @@ static int callSubroutineUnpackArray(voi
 288      SparseArrayEntry *iter;
 289      DataValue dvEntry, dvArray, argArray;
 290
 291 -    DISASM_RT(PC-1, 1);
 292 +    DISASM_RT();
 293
 294      GET_SYM(sym);
 295      GET_IMMED(nArgs);
 296 @@ -3026,7 +3030,7 @@ static int returnValOrNone(int valOnStac
 297      DataValue retVal;
 298      static DataValue noValue = {NO_TAG, {0}};
 299
 300 -    DISASM_RT(PC-1, 1);
 301 +    DISASM_RT();
 302      STACKDUMP(StackP - FrameP + FP_GET_ARG_COUNT(FrameP) + FP_TO_ARGS_DIST, 3);
 303
 304      /* return value is on the stack */
 305 @@ -3056,7 +3060,7 @@ static int branch(void)
 306  {
 307      Inst *addr;
 308
 309 -    DISASM_RT(PC-1, 2);
 310 +    DISASM_RT();
 311      STACKDUMP(0, 3);
 312
 313      GET_BRANCH(addr);
 314 @@ -3086,7 +3090,7 @@ static int branchIf(Boolean trueOrFalse)
 315      int value;
 316      Inst *addr;
 317
 318 -    DISASM_RT(PC-1, 2);
 319 +    DISASM_RT();
 320      STACKDUMP(1, 3);
 321
 322      GET_BRANCH(addr);
 323 @@ -3110,7 +3114,7 @@ static int branchNever(void)
 324  {
 325      Inst *addr;
 326
 327 -    DISASM_RT(PC-1, 2);
 328 +    DISASM_RT();
 329      STACKDUMP(0, 3);
 330
 331      GET_BRANCH(addr);
 332 @@ -3473,9 +3477,10 @@ static int arrayRef(void)
 333      char *keyString = NULL;
 334      int nDim;
 335
 336 +    DISASM_RT();
 337 +
 338      GET_IMMED(nDim);
 339
 340 -    DISASM_RT(PC-2, 2);
 341      STACKDUMP(nDim+1, 3);
 342
 343      if (nDim > 0) {
 344 @@ -3523,9 +3528,10 @@ static int arrayAssign(void)
 345      int errNum;
 346      int nDim;
 347
 348 +    DISASM_RT();
 349 +
 350      GET_IMMED(nDim);
 351
 352 -    DISASM_RT(PC-2, 1);
 353      STACKDUMP(nDim+2, 3);
 354
 355      if (nDim > 0) {
 356 @@ -3575,10 +3581,11 @@ static int arrayRefAndAssignSetup(void)
 357      char *keyString = NULL;
 358      int binaryOp, nDim;
 359
 360 +    DISASM_RT();
 361 +
 362      GET_IMMED(binaryOp);
 363      GET_IMMED(nDim);
 364
 365 -    DISASM_RT(PC-3, 3);
 366      STACKDUMP(nDim + (binaryOp ? 2 : 1), 3);
 367
 368      if (binaryOp) {
 369 @@ -3629,7 +3636,7 @@ static int beginArrayIter(void)
 370      DataValue *iteratorValPtr;
 371      DataValue arrayVal;
 372
 373 -    DISASM_RT(PC-1, 2);
 374 +    DISASM_RT();
 375      STACKDUMP(1, 3);
 376
 377      GET_SYM(iterator);
 378 @@ -3688,7 +3695,7 @@ static int arrayIter(void)
 379      Inst *branchAddr;
 380      int withVal;
 381
 382 -    DISASM_RT(PC-1, 4);
 383 +    DISASM_RT();
 384      STACKDUMP(0, 4);
 385
 386      GET_IMMED(withVal);
 387 @@ -3764,7 +3771,7 @@ static int beginArrayIterArray(void)
 388      DataValue arrayVal;
 389      int nDims;
 390
 391 -    DISASM_RT(PC-1, 2);
 392 +    DISASM_RT();
 393      STACKDUMP(2, 3);
 394
 395      GET_SYM(iterator);
 396 @@ -3866,7 +3873,7 @@ static int arrayIterArray(void)
 397      int nDims, d;
 398      Boolean keyFound = False;
 399
 400 -    DISASM_RT(PC-1, 4);
 401 +    DISASM_RT();
 402      STACKDUMP(1, 4);
 403
 404      GET_IMMED(withVal);
 405 @@ -3968,7 +3975,7 @@ static int inArray(void)
 406      char *keyStr;
 407      int inResult = 0;
 408
 409 -    DISASM_RT(PC-1, 1);
 410 +    DISASM_RT();
 411      STACKDUMP(2, 3);
 412
 413      POP(theArray);
 414 @@ -4012,9 +4019,10 @@ static int deleteArrayElement(void)
 415      char *keyString = NULL;
 416      int nDim;
 417
 418 +    DISASM_RT();
 419 +
 420      GET_IMMED(nDim);
 421
 422 -    DISASM_RT(PC-2, 2);
 423      STACKDUMP(nDim + 1, 3);
 424
 425      if (nDim > 0) {
 426 @@ -4105,7 +4113,7 @@ static int arrayAssignNext(void)
 427      DataValue srcValue, dstArray;
 428      int errNum;
 429
 430 -    DISASM_RT(PC-1, 1);
 431 +    DISASM_RT();
 432      STACKDUMP(2, 3);
 433
 434      POP(srcValue);
 435 @@ -4147,7 +4155,7 @@ static int arrayNextNumIdx(void)
 436      DataValue srcArray;
 437      SparseArrayEntry *iter;
 438
 439 -    DISASM_RT(PC-1, 1);
 440 +    DISASM_RT();
 441      STACKDUMP(1, 3);
 442
 443      POP(srcArray);