--- parser3/src/main/execute.C 2003/03/18 09:53:01 1.295.4.2 +++ parser3/src/main/execute.C 2003/04/07 12:39:32 1.296 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_EXECUTE_C="$Date: 2003/03/18 09:53:01 $"; +static const char* IDENT_EXECUTE_C="$Date: 2003/04/07 12:39:32 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -100,7 +100,6 @@ void debug_dump(Pool& pool, int level, c case OP_OBJECT_POOL: case OP_STRING_POOL: case OP_CALL: - case OP_CALL__WRITE: const Array *local_ops=reinterpret_cast(i.next()); debug_dump(pool, level+1, *local_ops); } @@ -387,8 +386,6 @@ void Request::execute(const Array& ops) case OP_CALL: case OP_CALL__WRITE: { -// pool().collect_garbage(); - Array *local_ops=static_cast(i.next()); #ifdef DEBUG_EXECUTE debug_printf(pool(), " (%d)\n", local_ops->size()); @@ -468,16 +465,6 @@ void Request::execute(const Array& ops) method.call_type==Method::CT_ANY || method.call_type==call_type) { // allowed call type? try { - { - char buf[MAX_STRING]; - const String& name=frame.name(); - snprintf(buf, MAX_STRING, "%s(%d): %s", - name.origin().file?name.origin().file:"unknown", - name.origin().line, - name.cstr()); - pool().log_high_watermark(buf); - } - method_frame=&frame; if(method.native_code) { // native code? method.check_actual_numbered_params( @@ -739,48 +726,54 @@ void Request::execute(const Array& ops) case OP_NUM_LT: { b=POP(); a=POP(); - double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result < 0.0); + volatile double a_double=a->as_double(); + volatile double b_double=b->as_double(); + value=NEW VBool(pool(), a_doubleas_double() - b->as_double(); - value=NEW VBool(pool(), result > 0.0); + volatile double a_double=a->as_double(); + volatile double b_double=b->as_double(); + value=NEW VBool(pool(), a_double>b_double); PUSH(value); break; } case OP_NUM_LE: { b=POP(); a=POP(); - double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result <= 0.0); + volatile double a_double=a->as_double(); + volatile double b_double=b->as_double(); + value=NEW VBool(pool(), a_double<=b_double); PUSH(value); break; } case OP_NUM_GE: { b=POP(); a=POP(); - double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result >= 0.0); + volatile double a_double=a->as_double(); + volatile double b_double=b->as_double(); + value=NEW VBool(pool(), a_double>=b_double); PUSH(value); break; } case OP_NUM_EQ: { b=POP(); a=POP(); - double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result == 0.0); + volatile double a_double=a->as_double(); + volatile double b_double=b->as_double(); + value=NEW VBool(pool(), a_double==b_double); PUSH(value); break; } case OP_NUM_NE: { b=POP(); a=POP(); - double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result != 0.0); + volatile double a_double=a->as_double(); + volatile double b_double=b->as_double(); + value=NEW VBool(pool(), a_double!=b_double); PUSH(value); break; }