From 2199a1e5c1572fbedef3365e060db84a5527a111 Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@gmail.com>
Date: Sat, 22 Nov 2014 22:22:23 -0800
Subject: [PATCH] Fix initializers of addresses in variables

---
 src/toolsrc/sb.pla | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/toolsrc/sb.pla b/src/toolsrc/sb.pla
index ecf134f..02ad9bd 100644
--- a/src/toolsrc/sb.pla
+++ b/src/toolsrc/sb.pla
@@ -2865,7 +2865,7 @@ def parse_term
 end
 def parse_constval(valptr, sizeptr)
     byte mod, type
-    word idptr
+    word idptr, ctag
 
     mod     = 0
     type    = 0
@@ -2908,9 +2908,26 @@ def parse_constval(valptr, sizeptr)
             idptr    = id_lookup(tknptr, tknlen)
             if !idptr; return parse_err(@bad_cnst); fin
             type    = idptr->idtype
-            *valptr = idptr=>idval
-            if type & VAR_TYPE and !(mod & 8); return parse_err(@bad_cnst); fin
-	    break
+            if type & VAR_TYPE
+	        if !(mod & 8); return parse_err(@bad_cnst); fin
+		if idptr=>idval & IS_CTAG
+                    ctag = idptr=>idval & MASK_CTAG
+		    if ctag_tbl:[ctag] & IS_RESOLVED
+	                *valptr = (ctag_tbl:[ctag] & MASK_CTAG) + codebuff
+		    else
+                        //
+			// Add to list of tags needing resolution
+			//
+			*valptr = ctag_tbl:[ctag] & MASK_CTAG
+			ctag_tbl:[ctag] = valptr - codebuff
+                    fin
+                else
+                    *valptr = idptr=>idval + codebuff
+		fin
+	    else
+                *valptr = idptr=>idval
+            fin
+    	    break
         otherwise
             return parse_err(@bad_cnst)
     wend