From e8595028115a51bd50ed3456dee010e1faa8532f Mon Sep 17 00:00:00 2001
From: Joel Dice <git@seibutsu.mailsnare.net>
Date: Tue, 11 Nov 2008 11:56:43 -0700
Subject: [PATCH] handle unresolved constants in moveCM

---
 src/x86.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/x86.cpp b/src/x86.cpp
index 6028d33b1d..871ca3cf74 100644
--- a/src/x86.cpp
+++ b/src/x86.cpp
@@ -895,8 +895,6 @@ void
 moveCM(Context* c, unsigned aSize UNUSED, Assembler::Constant* a,
        unsigned bSize, Assembler::Memory* b)
 {
-  int64_t v = a->value->value();
-
   switch (bSize) {
   case 1:
     encode(c, 0xc6, 0, b, false);
@@ -910,10 +908,17 @@ moveCM(Context* c, unsigned aSize UNUSED, Assembler::Constant* a,
 
   case 4:
     encode(c, 0xc7, 0, b, false);
-    c->code.append4(a->value->value());
+    if (a->value->resolved()) {
+      c->code.append4(a->value->value());
+    } else {
+      appendImmediateTask(c, a->value, offset(c));
+      c->code.append4(0);
+    }
     break;
 
   case 8: {
+    int64_t v = a->value->value();
+
     ResolvedPromise high((v >> 32) & 0xFFFFFFFF);
     Assembler::Constant ah(&high);