update to v1.5

README.md

@@ -16,26 +16,26 @@ There are 3 format types :
 
 ```assembly
 operations:
-	add R1 R2 #1
-	sub R1 R2 R3
-	and R1 R2 #33
-	xor R1 R2 R3
-	or R1 R2 R3
-	sl R1 R2 R3
-	sr R1 R2 R3
-	mul R1 R2 R3
+	ADD R1 R2 #1
+	SUB R1 R2 R3
+	AND R1 R2 #33
+	XOR R1 R2 R3
+	OR R1 R2 R3
+	SL R1 R2 R3
+	SR R1 R2 R3
+	MUL R1 R2 R3
 io:
-	str R1 R2 R3
-	ld R1 R2 R3
+	STR R1 R2 R3
+	LD R1 R2 R3
 sauts:
-	jmp controle
-	jequ R1 R2 io
-	jneq R1 R2 sauts
-	jsup R1 R2 operations
-	jinf R1 R2 controle
+	JMP controle
+	JEQU R1 R2 io
+	JNEQ R1 R2 sauts
+	JSUP R1 R2 operations
+	JINF R1 R2 controle
 controle:
-	call io
-	ret
+	CALL io
+	RET
 ```
 
 Produces
@@ -49,20 +49,25 @@ Produces
 01010000 10100110 00000000 00000000
 01100000 10100110 00000000 00000000
 01110000 10100110 00000000 00000000
-01000001 01001100 00000000 00000000
-01010001 01001100 00000000 00000000
+01000000 10100110 00000000 00000000
+01010000 10100110 00000000 00000000
 11000000 00000000 00000000 00010000
-11010001 01000000 00000000 00001001
-11100001 01000000 00000000 00001011
-11110001 01000000 00000000 00000001
-11000001 01000000 00000000 00010000
+11010000 10100000 00000000 00001001
+11100000 10100000 00000000 00001011
+11110000 10100000 00000000 00000001
+11000000 10100000 00000000 00010000
 11010000 00000000 00000000 00001001
 11100000 00000000 00000000 00000000
 ```
 
+## Releases
+
+Pre-compiled binaries are available in the [Release](https://git.ale-pri.com/Persson-dev/Assembleur/releases) section.
+
 ## Build
 
-You should have [xmake](https://xmake.io) installed
+If you wish to compile yourself, you must have [xmake](https://xmake.io) installed.
+Instructions on how to install (and you should) [here](https://xmake.io/#/guide/installation)
 
 ```bash
 xmake
@@ -73,3 +78,18 @@ xmake
 ```bash
 xmake run Assembleur [args]
 ```
+
+Example :
+
+```bash
+xmake run Assembleur test.asm -o memory
+```
+
+Parses the file `test.asm` and writes the output into the file `memory`
+
+## Install
+
+You can also add the binary to your path using
+```bash
+xmake install
+```

src/Assembleur.cpp

@@ -1,5 +1,6 @@
 #include "Assembleur.h"
 
+#include <algorithm>
 #include <map>
 #include <sstream>
 #include <stdexcept>
@@ -79,11 +80,11 @@ std::uint32_t Assembleur::ParseOperationImmediate(
 }
 
 std::uint32_t Assembleur::ParseJump(Instruction a_Instruction, const std::string& a_Label) {
-	return IToInt(a_Instruction) | ParseLabel(a_Label);
+	return IToInt(a_Instruction) | ParseLabel(a_Label) & 0x3FFFFFF;
 }
 
 std::uint32_t Assembleur::ParseJump(Instruction a_Instruction, std::uint8_t a_R1, std::uint8_t a_R2, const std::string& a_Label) {
-	return IToInt(a_Instruction) | a_R1 << 24 | a_R2 << 21 | ParseLabel(a_Label);
+	return IToInt(a_Instruction) | a_R1 << 23 | a_R2 << 20 | ParseLabel(a_Label) & 0xFFFFF;
 }
 
 std::uint32_t Assembleur::ParseJump(Instruction a_Instruction) {
@@ -91,7 +92,7 @@ std::uint32_t Assembleur::ParseJump(Instruction a_Instruction) {
 }
 
 std::uint32_t Assembleur::ParseIO(Instruction a_Instruction, std::uint32_t a_R1, std::uint32_t a_R2, std::uint32_t a_R3) {
-	return IToInt(a_Instruction) | a_R1 << 24 | a_R2 << 21 | a_R3 << 18;
+	return IToInt(a_Instruction) | a_R1 << 23 | a_R2 << 20 | a_R3 << 17;
 }
 
 
@@ -122,6 +123,9 @@ std::uint32_t Assembleur::ParseInstruction(const std::string& a_Str, std::uint32
 	std::string ins;
 	ss >> ins;
 
+	// to lower case
+	std::transform(ins.begin(), ins.end(), ins.begin(), [](unsigned char c) { return std::tolower(c); });
+
 	auto it = INSTRUCTION_KEYS.find(ins);
 	if (it == INSTRUCTION_KEYS.end()) {
 		throw std::invalid_argument("[Line " + std::to_string(a_RealLine) + "] " + "Instruction \"" + ins + "\" not found !");

src/main.cpp

@@ -3,7 +3,7 @@
 
 #include "IO.h"
 
-#define ASSEMBLEUR_VERSION "1.2"
+#define ASSEMBLEUR_VERSION "1.5"
 
 int main(int argc, char** argv) {
 

test.asm

@@ -1,21 +1,21 @@
 operations:
-	add R1 R2 #1
-	sub R1 R2 R3
-	and R1 R2 #33
-	xor R1 R2 R3
-	or R1 R2 R3
-	sl R1 R2 R3
-	sr R1 R2 R3
-	mul R1 R2 R3
+	ADD R1 R2 #1
+	SUB R1 R2 R3
+	AND R1 R2 #33
+	XOR R1 R2 R3
+	OR R1 R2 R3
+	SL R1 R2 R3
+	SR R1 R2 R3
+	MUL R1 R2 R3
 io:
-	str R1 R2 R3
-	ld R1 R2 R3
+	STR R1 R2 R3
+	LD R1 R2 R3
 sauts:
-	jmp controle
-	jequ R1 R2 io
-	jneq R1 R2 sauts
-	jsup R1 R2 operations
-	jinf R1 R2 controle
+	JMP controle
+	JEQU R1 R2 io
+	JNEQ R1 R2 sauts
+	JSUP R1 R2 operations
+	JINF R1 R2 controle
 controle:
-	call io
-	ret
+	CALL io
+	RET

xmake.lua

@@ -9,3 +9,7 @@ target("Assembleur")
     add_files("src/*.cpp")
     set_rundir(".")
     add_packages("argparse")
+
+    if is_os("windows") then
+        add_ldflags("-static", "-static-libstdc++")
+    end