mangle label names

attila-lendvai · Mar 29, 2013 · 1928e9a · 1928e9a
1 parent d481583
commit 1928e9a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/ir-gen-c.k b/ir-gen-c.k
@@ -160,11 +160,12 @@
 
 (define-method ir-gen-c <ir-nop>	  (gen)	())
 (define-method ir-gen-c <ir-define>	  (gen)	(ir-gen-c (car self.operands) gen))
-(define-method ir-gen-c <ir-define-label> (gen)	(print "v_"(car self.parameters)":"))
+(define-method ir-gen-c <ir-define-label> (gen)	(print (ir-gen-c-variable-name (symbol->string (car self.parameters))) ":"))
 
 (define-method ir-gen-c <ir-goto> (gen)
   (if (ir-label-expression? (car self.operands))
-      (print "goto v_"(<ir-variable>-name (<ir-get-var>-parameters (car self.operands))))
+	;;; (print "goto v_"(<ir-variable>-name (<ir-get-var>-parameters (car self.operands))))
+      (print "goto "(ir-gen-c-variable-name (<ir-variable>-name (<ir-get-var>-parameters (car self.operands)))))
     (print "goto *(")
     (ir-gen-c (car self.operands) gen)
     (print ")")))

diff --git a/ir-gen-x86.k b/ir-gen-x86.k
@@ -232,7 +232,7 @@
     ((ir-struct-type? self.type)	(ir-gen-x86-move-struct self.type
 								(<ir-variable>-location self.parameters)
 								self.location gen))
-    ((ir-label-var? self.parameters)	(emitln gen "	movl	$"(<ir-variable>-name self.parameters)", %eax # LABEL"))
+    ((ir-label-var? self.parameters)	(emitln gen "	movl	$"(ir-gen-x86-variable-name self.parameters)", %eax # LABEL"))
     (else				(ir-gen-x86-load (<ir-variable>-type self.parameters)
 							 (<ir-variable>-location self.parameters) gen)))
   (info gen 2 "# get var done"))
@@ -271,7 +271,7 @@
 (define-method ir-gen-x86-allocate <ir-define-label> (gen))
 
 (define-method ir-gen-x86 <ir-define-label> (gen)
-  (emitln gen (car self.parameters)":"))
+  (emitln gen "v_"(x86-mangle (symbol->string (car self.parameters)))":"))
 
 (define-method ir-gen-x86-allocate <ir-goto> (gen) (ir-gen-x86-allocate (car self.operands) gen))