home *** CD-ROM | disk | FTP | other *** search
/ Usenet 1994 January / usenetsourcesnewsgroupsinfomagicjanuary1994.iso / sources / sun / volume1 / calctool / patch01 / patch
Encoding:
Text File  |  1989-07-12  |  6.8 KB  |  137 lines
  1. *** ops.c.orig    Tue Jul 11 10:56:04 1989
  2. --- ops.c    Tue Jul 11 11:07:49 1989
  3. ***************
  4. *** 36,53 ****
  5.   
  6.   #define        low_order(b, x)        ((((unsigned) 0xffffffff) >> (32 - (b))) & (x))
  7.   
  8.   PRIVATE    pop_op()
  9.   
  10.   {    int    i, temp;
  11.   
  12.       if (curr_mode != SCIENTIFIC && o_stack[o_top - 1]) {
  13. !        v_stack[v_top] = (double) low_order(curr_width[index_of(curr_base)], (unsigned int) v_stack[v_top]);
  14. !        v_stack[v_top - 1] = (double) low_order(curr_width[index_of(curr_base)], (unsigned int) v_stack[v_top - 1]);
  15.          }
  16.       switch (o_stack[--o_top]) {
  17.          case ADD_OP    : v_stack[v_top - 1] += v_stack[v_top];
  18.                          break;
  19. !        case AND_OP    : temp = ((unsigned int) v_stack[v_top - 1]) & ((unsigned int) v_stack[v_top]);
  20.                          v_stack[v_top - 1] = (double) temp;
  21.                          break;
  22.          case DIV_OP    : v_stack[v_top - 1] /= v_stack[v_top];
  23. --- 36,62 ----
  24.   
  25.   #define        low_order(b, x)        ((((unsigned) 0xffffffff) >> (32 - (b))) & (x))
  26.   
  27. + /************************************************************************/
  28. + /*    In the following code, the apparently extraneous assignments    */
  29. + /* to vt1 and vt2 are used to circumvent a bug in the 386i C compiler    */
  30. + /* which hangs when trying to compile code which casts a (double *) to    */
  31. + /* (unsigned int).  Sigh...                        */
  32. + /************************************************************************/
  33. + 
  34. + PRIVATE    double    vt1, vt2;
  35. + 
  36.   PRIVATE    pop_op()
  37.   
  38.   {    int    i, temp;
  39.   
  40.       if (curr_mode != SCIENTIFIC && o_stack[o_top - 1]) {
  41. !        v_stack[v_top] = (double) low_order(curr_width[index_of(curr_base)], (unsigned int) (vt1 = v_stack[v_top]));
  42. !        v_stack[v_top - 1] = (double) low_order(curr_width[index_of(curr_base)], (unsigned int) (vt2 = v_stack[v_top - 1]));
  43.          }
  44.       switch (o_stack[--o_top]) {
  45.          case ADD_OP    : v_stack[v_top - 1] += v_stack[v_top];
  46.                          break;
  47. !        case AND_OP    : temp = ((unsigned int) (vt1 = v_stack[v_top - 1])) & ((unsigned int) (vt2 = v_stack[v_top]));
  48.                          v_stack[v_top - 1] = (double) temp;
  49.                          break;
  50.          case DIV_OP    : v_stack[v_top - 1] /= v_stack[v_top];
  51. ***************
  52. *** 54,86 ****
  53.                          break;
  54.          case LPAREN_OP : return;
  55.                      break;
  56. !        case LSL_OP    : temp = ((unsigned int) v_stack[v_top - 1]) << ((unsigned int) v_stack[v_top]);
  57.                          v_stack[v_top - 1] = (double) temp;
  58.                          break;
  59.          case MUL_OP    : v_stack[v_top - 1] *= v_stack[v_top];
  60.                          break;
  61. !        case OR_OP     : temp = ((unsigned int) v_stack[v_top - 1]) | ((unsigned int) v_stack[v_top]);
  62.                          v_stack[v_top - 1] = (double) temp;
  63.                          break;
  64. !        case ROL_OP    : for (i = (unsigned int) v_stack[v_top], temp = (unsigned int) v_stack[v_top - 1]; i; i--)
  65.                         temp = (temp << 1) + ((((unsigned) temp) >> (curr_width[index_of(curr_base)] - 1)) & 1);
  66.                      v_stack[v_top - 1] = (double) low_order(curr_width[index_of(curr_base)], temp);
  67.                          break;
  68.          case ROOT_OP   : v_stack[v_top - 1] = pow(v_stack[v_top - 1], 1.0 / v_stack[v_top]);
  69.                          break;
  70. !        case ROR_OP    : for (i = (unsigned int) v_stack[v_top], temp = (unsigned int) v_stack[v_top - 1]; i; i--)
  71.                         temp = (((unsigned) temp) >> 1) + ((temp & 1) << (curr_width[index_of(curr_base)] - 1));
  72.                      v_stack[v_top - 1] = (double) low_order(curr_width[index_of(curr_base)], temp);
  73.                          break;
  74. !        case RSA_OP    : temp = ((unsigned int) v_stack[v_top - 1]) >> ((unsigned int) v_stack[v_top]);
  75.                          v_stack[v_top - 1] = (double) temp;
  76.                          break;
  77. !        case RSL_OP    : temp = ((unsigned int) ((unsigned int) v_stack[v_top - 1])) >> ((unsigned int) v_stack[v_top]);
  78.                          v_stack[v_top - 1] = (double) temp;
  79.                          break;
  80.          case SUB_OP    : v_stack[v_top - 1] -= v_stack[v_top];
  81.                          break;
  82. !        case XOR_OP    : temp = ((unsigned int) v_stack[v_top - 1]) ^ ((unsigned int) v_stack[v_top]);
  83.                          v_stack[v_top - 1] = (double) temp;
  84.                          break;
  85.          case Y2X_OP    : v_stack[v_top - 1] = pow(v_stack[v_top - 1], v_stack[v_top]);
  86. --- 63,95 ----
  87.                          break;
  88.          case LPAREN_OP : return;
  89.                      break;
  90. !        case LSL_OP    : temp = ((unsigned int) (vt1 = v_stack[v_top - 1])) << ((unsigned int) (vt2 = v_stack[v_top]));
  91.                          v_stack[v_top - 1] = (double) temp;
  92.                          break;
  93.          case MUL_OP    : v_stack[v_top - 1] *= v_stack[v_top];
  94.                          break;
  95. !        case OR_OP     : temp = ((unsigned int) (vt1 = v_stack[v_top - 1])) | ((unsigned int) (vt2 = v_stack[v_top]));
  96.                          v_stack[v_top - 1] = (double) temp;
  97.                          break;
  98. !        case ROL_OP    : for (i = (unsigned int) (vt1 = v_stack[v_top]), temp = (unsigned int) (vt2 = v_stack[v_top - 1]); i; i--)
  99.                         temp = (temp << 1) + ((((unsigned) temp) >> (curr_width[index_of(curr_base)] - 1)) & 1);
  100.                      v_stack[v_top - 1] = (double) low_order(curr_width[index_of(curr_base)], temp);
  101.                          break;
  102.          case ROOT_OP   : v_stack[v_top - 1] = pow(v_stack[v_top - 1], 1.0 / v_stack[v_top]);
  103.                          break;
  104. !        case ROR_OP    : for (i = (unsigned int) (vt1 = v_stack[v_top]), temp = (unsigned int) (vt2 = v_stack[v_top - 1]); i; i--)
  105.                         temp = (((unsigned) temp) >> 1) + ((temp & 1) << (curr_width[index_of(curr_base)] - 1));
  106.                      v_stack[v_top - 1] = (double) low_order(curr_width[index_of(curr_base)], temp);
  107.                          break;
  108. !        case RSA_OP    : temp = ((unsigned int) (vt1 = v_stack[v_top - 1])) >> ((unsigned int) (vt2 = v_stack[v_top]));
  109.                          v_stack[v_top - 1] = (double) temp;
  110.                          break;
  111. !        case RSL_OP    : temp = ((unsigned int) (vt1 = v_stack[v_top - 1])) >> ((unsigned int) (vt2 = v_stack[v_top]));
  112.                          v_stack[v_top - 1] = (double) temp;
  113.                          break;
  114.          case SUB_OP    : v_stack[v_top - 1] -= v_stack[v_top];
  115.                          break;
  116. !        case XOR_OP    : temp = ((unsigned int) (vt1 = v_stack[v_top - 1])) ^ ((unsigned int) (vt2 = v_stack[v_top]));
  117.                          v_stack[v_top - 1] = (double) temp;
  118.                          break;
  119.          case Y2X_OP    : v_stack[v_top - 1] = pow(v_stack[v_top - 1], v_stack[v_top]);
  120. ***************
  121. *** 199,205 ****
  122.                         break;
  123.          case LOG_OP    : v_stack[v_top] = log10(v_stack[v_top]);
  124.                         break;
  125. !        case NOT_OP    : v_stack[v_top] = (double) low_order(curr_width[index_of(curr_base)], (~ (unsigned int) v_stack[v_top]));
  126.                         break;
  127.          case OVER_OP   : v_stack[v_top] = 1.0 / v_stack[v_top];
  128.                         break;
  129. --- 208,214 ----
  130.                         break;
  131.          case LOG_OP    : v_stack[v_top] = log10(v_stack[v_top]);
  132.                         break;
  133. !        case NOT_OP    : v_stack[v_top] = (double) low_order(curr_width[index_of(curr_base)], (~ (unsigned int) (vt1 = v_stack[v_top])));
  134.                         break;
  135.          case OVER_OP   : v_stack[v_top] = 1.0 / v_stack[v_top];
  136.                         break;
  137.