From b09a06d07a3a96580ed7a46628a3ef6739efc26a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cle=CC=81ment=20Grennerat?= <clement.grennerat@clgr.io>
Date: Mon, 2 Mar 2026 11:11:40 +0100
Subject: [PATCH] Fixing arm instructions

---
 .gitignore                  |  3 +++
 compiler/CodeGenVisitor.cpp | 10 +++++++---
 compiler/Makefile           |  8 ++++----
 compiler/config-IF501.mk    |  4 ----
 compiler/config-wsl-2025.mk |  3 ---
 compiler/config.example.mk  |  3 +++
 6 files changed, 17 insertions(+), 14 deletions(-)
 delete mode 100644 compiler/config-IF501.mk
 delete mode 100644 compiler/config-wsl-2025.mk
 create mode 100644 compiler/config.example.mk

diff --git a/.gitignore b/.gitignore
index 02d5c37..e36bf11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 compiler/config.mk
+compiler/build/
+compiler/generated/
+ifcc-test-output/
diff --git a/compiler/CodeGenVisitor.cpp b/compiler/CodeGenVisitor.cpp
index 12a56a7..31c0894 100644
--- a/compiler/CodeGenVisitor.cpp
+++ b/compiler/CodeGenVisitor.cpp
@@ -1,6 +1,6 @@
 #include "CodeGenVisitor.h"
 
-antlrcpp::Any CodeGenVisitor::visitProg(ifccParser::ProgContext *ctx) 
+antlrcpp::Any CodeGenVisitor::visitProg(ifccParser::ProgContext *ctx)
 {
     #ifdef __APPLE__
     std::cout<< ".globl _main\n" ;
@@ -11,7 +11,7 @@ antlrcpp::Any CodeGenVisitor::visitProg(ifccParser::ProgContext *ctx)
     #endif
 
     this->visit( ctx->return_stmt() );
-    
+
     std::cout << "    ret\n";
 
     return 0;
@@ -22,7 +22,11 @@ antlrcpp::Any CodeGenVisitor::visitReturn_stmt(ifccParser::Return_stmtContext *c
 {
     int retval = stoi(ctx->CONST()->getText());
 
-    std::cout << "    movl $"<<retval<<", %eax\n" ;
+    #ifdef __APPLE__
+        std::cout << "    mov w0, #"<<retval<<"\n" ;
+    #else
+        std::cout << "    movl $"<<retval<<", %eax\n" ;
+    #endif
 
     return 0;
 }
diff --git a/compiler/Makefile b/compiler/Makefile
index c29c925..09950ee 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -12,7 +12,7 @@ default: all
 all: ifcc
 
 ##########################################
-# link together all pieces of our compiler 
+# link together all pieces of our compiler
 OBJECTS=build/ifccBaseVisitor.o \
 	build/ifccLexer.o \
 	build/ifccVisitor.o \
@@ -28,13 +28,13 @@ ifcc: $(OBJECTS)
 # compile our hand-writen C++ code: main(), CodeGenVisitor, etc.
 build/%.o: %.cpp generated/ifccParser.cpp
 	@mkdir -p build
-	$(CC) $(CCFLAGS) -MMD -o $@ $< 
+	$(CC) $(CCFLAGS) -MMD -o $@ $<
 
 ##########################################
 # compile all the antlr-generated C++
 build/%.o: generated/%.cpp
 	@mkdir -p build
-	$(CC) $(CCFLAGS) -MMD -o $@ $< 
+	$(CC) $(CCFLAGS) -MMD -o $@ $<
 
 # automagic dependency management: `gcc -MMD` generates all the .d files for us
 -include build/*.d
@@ -50,7 +50,7 @@ generated/ifccParser.cpp: ifcc.g4
 	java -jar $(ANTLRJAR) -visitor -no-listener -Dlanguage=Cpp -o generated ifcc.g4
 
 # prevent automatic cleanup of "intermediate" files like ifccLexer.cpp etc
-.PRECIOUS: generated/ifcc%.cpp   
+.PRECIOUS: generated/ifcc%.cpp
 
 ##########################################
 # view the parse tree in a graphical window
diff --git a/compiler/config-IF501.mk b/compiler/config-IF501.mk
deleted file mode 100644
index 76c4b4b..0000000
--- a/compiler/config-IF501.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# these values work with the "install-antlr.sh" script provided for the PLD
-ANTLRJAR=../antlr/jar/antlr-4.9.2-complete.jar
-ANTLRINC=../antlr/include
-ANTLRLIB=../antlr/lib/libantlr4-runtime.a
diff --git a/compiler/config-wsl-2025.mk b/compiler/config-wsl-2025.mk
deleted file mode 100644
index 5dbf44b..0000000
--- a/compiler/config-wsl-2025.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-ANTLRJAR=/home/$(USER)/antlr4-install/antlr-4.13.2-complete.jar
-ANTLRINC=/usr/local/include/antlr4-runtime/
-ANTLRLIB=/usr/local/lib/libantlr4-runtime.a
diff --git a/compiler/config.example.mk b/compiler/config.example.mk
new file mode 100644
index 0000000..7868327
--- /dev/null
+++ b/compiler/config.example.mk
@@ -0,0 +1,3 @@
+ANTLRJAR=$(shell brew --prefix antlr)/antlr-4.13.2-complete.jar
+ANTLRINC=$(shell brew --prefix antlr4-cpp-runtime)/include/antlr4-runtime
+ANTLRLIB=$(shell brew --prefix antlr4-cpp-runtime)/lib/libantlr4-runtime.a