diff --git a/src/compile.cpp b/src/compile.cpp index 37ff053e4..afea5aa07 100644 --- a/src/compile.cpp +++ b/src/compile.cpp @@ -3976,16 +3976,16 @@ lir::TernaryOperation toCompilerBinaryOp(MyThread* t, unsigned instruction) case iushr: case lushr: return lir::UnsignedShiftRight; - case fadd: + case ::vm::fadd: case dadd: return lir::FloatAdd; - case fsub: + case ::vm::fsub: case dsub: return lir::FloatSubtract; - case fmul: + case ::vm::fmul: case dmul: return lir::FloatMultiply; - case fdiv: + case ::vm::fdiv: case ddiv: return lir::FloatDivide; case frem: @@ -4573,10 +4573,10 @@ void compile(MyThread* t, c->f2i(ir::Type::i8(), frame->pop(ir::Type::f4()))); } break; - case fadd: - case fsub: - case fmul: - case fdiv: + case ::vm::fadd: + case ::vm::fsub: + case ::vm::fmul: + case ::vm::fdiv: case frem: { ir::Value* a = frame->pop(ir::Type::f4()); ir::Value* b = frame->pop(ir::Type::f4()); diff --git a/src/debug-util.cpp b/src/debug-util.cpp index a0247c00a..406d74f3f 100644 --- a/src/debug-util.cpp +++ b/src/debug-util.cpp @@ -140,7 +140,7 @@ int printInstruction(uint8_t* code, unsigned& ip, const char* prefix) return fprintf(stderr, "f2i"); case f2l: return fprintf(stderr, "f2l"); - case fadd: + case ::vm::fadd: return fprintf(stderr, "fadd"); case faload: return fprintf(stderr, "faload"); @@ -156,15 +156,15 @@ int printInstruction(uint8_t* code, unsigned& ip, const char* prefix) return fprintf(stderr, "fconst_1"); case fconst_2: return fprintf(stderr, "fconst_2"); - case fdiv: + case ::vm::fdiv: return fprintf(stderr, "fdiv"); - case fmul: + case ::vm::fmul: return fprintf(stderr, "fmul"); case fneg: return fprintf(stderr, "fneg"); case frem: return fprintf(stderr, "frem"); - case fsub: + case ::vm::fsub: return fprintf(stderr, "fsub"); case getfield: diff --git a/src/machine.cpp b/src/machine.cpp index 1383da46e..0c2e42416 100644 --- a/src/machine.cpp +++ b/src/machine.cpp @@ -1693,7 +1693,7 @@ void disassembleCode(const char* prefix, uint8_t* code, unsigned length) case f2l: fprintf(stderr, "f2l\n"); break; - case fadd: + case ::vm::fadd: fprintf(stderr, "fadd\n"); break; case faload: @@ -1717,10 +1717,10 @@ void disassembleCode(const char* prefix, uint8_t* code, unsigned length) case fconst_2: fprintf(stderr, "fconst_2\n"); break; - case fdiv: + case ::vm::fdiv: fprintf(stderr, "fdiv\n"); break; - case fmul: + case ::vm::fmul: fprintf(stderr, "fmul\n"); break; case fneg: @@ -1729,7 +1729,7 @@ void disassembleCode(const char* prefix, uint8_t* code, unsigned length) case frem: fprintf(stderr, "frem\n"); break; - case fsub: + case ::vm::fsub: fprintf(stderr, "fsub\n"); break;