From 981c4d47830f698f3c92f4dc58194f07c5a98ab7 Mon Sep 17 00:00:00 2001
From: Ben Kurtovic <ben.kurtovic@gmail.com>
Date: Sun, 17 May 2015 04:00:57 -0400
Subject: [PATCH] Disable ASan; bugfix for immediate masks.

---
 makefile                   | 2 +-
 src/assembler/parse_util.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/makefile b/makefile
index b6763ab..fdf785b 100644
--- a/makefile
+++ b/makefile
@@ -24,7 +24,7 @@ DIRS = $(sort $(dir $(OBJS)))
 
 ifdef DEBUG
 	BNRY  := $(BNRY)$(DEVEXT)
-	FLAGS += -g -fsanitize=address -DDEBUG_MODE
+	FLAGS += -g -DDEBUG_MODE
 	MODE   = debug
 endif
 
diff --git a/src/assembler/parse_util.c b/src/assembler/parse_util.c
index 12b6bdb..fd4e776 100644
--- a/src/assembler/parse_util.c
+++ b/src/assembler/parse_util.c
@@ -362,10 +362,10 @@ bool argparse_immediate(ASMArgImmediate *result, ASMArgParseInfo ai)
     const ASMDefine *define = asm_deftable_find(ai.deftable, ai.arg, ai.size);
     if (define) {
         if (negative) {
-            calculate_immediate_mask(result);
             result->is_label = false;
             result->uval = define->value.uval;
             result->sval = -define->value.sval;
+            calculate_immediate_mask(result);
         } else {
             *result = define->value;
         }
@@ -386,10 +386,10 @@ bool argparse_immediate(ASMArgImmediate *result, ASMArgParseInfo ai)
     if (sval < INT16_MIN)
         return false;
 
-    calculate_immediate_mask(result);
     result->is_label = false;
     result->uval = uval;
     result->sval = sval;
+    calculate_immediate_mask(result);
     return true;
 }