Allow usage of pseudo instruction ldr with .equ

linouxis9 · Mar 28, 2019 · 36ac597 · 36ac597
1 parent 5abaf21
commit 36ac597
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/projetarm_v2/simulator/Main.java b/src/projetarm_v2/simulator/Main.java
@@ -21,7 +21,7 @@ public static void main(String[] args) {
 				"kek: .asciz \"test\";" + 
 				".align;" + 
 				"start: ldr r0,=kek;" + 
-				"mov r1,#0xFF04;" +
+				"ldr r1,=0x1F0008;" +
 				"blx r1");
 
 		simulator.run();

diff --git a/src/projetarm_v2/simulator/core/Preprocessor.java b/src/projetarm_v2/simulator/core/Preprocessor.java
@@ -25,6 +25,7 @@ public static String pass1(String assembly) {
 
 		while (matcher.find()) {
 			assembly = assembly.replaceAll("#"+ matcher.group(1), "#"+matcher.group(2));
+			assembly = assembly.replaceAll("="+ matcher.group(1), "="+matcher.group(2));
 		}
 
 		assembly = assembly