Fix compilation on amd64 (not working yet, just building)

diff --git a/masm/assembler/MacroAssembler.h b/masm/assembler/MacroAssembler.h
index 1a9af29..43c9b47 100644 (file)
--- a/masm/assembler/MacroAssembler.h
+++ b/masm/assembler/MacroAssembler.h
@@ -578,7 +578,7 @@ public:
         default: {
             if (value <= 0xff)
                 return false;
-#if CPU(X86_64)
+#if CPU(X86_64) && 0
             JSValue jsValue = JSValue::decode(reinterpret_cast<void*>(value));
             if (jsValue.isInt32())
                 return shouldBlind(Imm32(jsValue.asInt32()));

diff --git a/masm/config.h b/masm/config.h
index d462525..7e0779f 100644 (file)
--- a/masm/config.h
+++ b/masm/config.h
@@ -6,5 +6,6 @@
 #include <wtf/Vector.h>
 #endif
 #include <limits.h>
+#include <math.h>
 
 #endif // MASM_CONFIG_H

diff --git a/masm/disassembler/udis86/ud_opcode.pyc b/masm/disassembler/udis86/ud_opcode.pyc
index cade0c2..75a1d62 100644 (file)
Binary files a/masm/disassembler/udis86/ud_opcode.pyc and b/masm/disassembler/udis86/ud_opcode.pyc differ

diff --git a/masm/disassembler/udis86/ud_optable.pyc b/masm/disassembler/udis86/ud_optable.pyc
index 8f36a9c..76896dc 100644 (file)
Binary files a/masm/disassembler/udis86/ud_optable.pyc and b/masm/disassembler/udis86/ud_optable.pyc differ

diff --git a/masm/stubs/WTFStubs.cpp b/masm/stubs/WTFStubs.cpp
index 072bfdb..7e16bbc 100644 (file)
--- a/masm/stubs/WTFStubs.cpp
+++ b/masm/stubs/WTFStubs.cpp
@@ -7,7 +7,7 @@
 
 namespace WTF {
 
-void* fastMalloc(unsigned int size)
+void* fastMalloc(size_t size)
 {
     return malloc(size);
 }

diff --git a/qv4isel_masm_p.h b/qv4isel_masm_p.h
index 910040e..a177f9c 100644 (file)
--- a/qv4isel_masm_p.h
+++ b/qv4isel_masm_p.h
@@ -33,6 +33,17 @@ protected:
     static const RegisterID Gpr3 = JSC::X86Registers::esi;
     static const RegisterID CalleeSavedGpr = Gpr3;
     static const FPRegisterID FPGpr0 = JSC::X86Registers::xmm0;
+#elif CPU(X86_64)
+    static const RegisterID StackFrameRegister = JSC::X86Registers::ebp;
+    static const RegisterID StackPointerRegister = JSC::X86Registers::esp;
+    static const RegisterID ContextRegister = JSC::X86Registers::esi;
+    static const RegisterID ReturnValueRegister = JSC::X86Registers::eax;
+    static const RegisterID Gpr0 = JSC::X86Registers::eax;
+    static const RegisterID Gpr1 = JSC::X86Registers::ecx;
+    static const RegisterID Gpr2 = JSC::X86Registers::edx;
+    static const RegisterID Gpr3 = JSC::X86Registers::esi;
+    static const RegisterID CalleeSavedGpr = Gpr3;
+    static const FPRegisterID FPGpr0 = JSC::X86Registers::xmm0;
 #else
 #error Argh.
 #endif