update to v1.6

README.md

@@ -16,53 +16,58 @@ There are 3 format types :
 
 ```assembly
 operations:
-	add R1 R2 R3
+	ADD R1 R2 #1
-	sub R1 R2 #69
+	SUB R1 R2 R3
-	and R0 R6 R3
+	AND R1 R2 #33
-	xor R1 R2 R3
+	XOR R1 R2 R3
-	or R1 R7 R3
+	OR R1 R2 R3
-	sl R5 R2 #10
+	SL R1 R2 R3
-	sr R1 R2 R3
+	SR R1 R2 R3
-	mult R1 R1 R3
+	MUL R1 R2 R3
 io:
-	str R1 R2 R3
+	STR R1 R2 R3
-	ld R1 R2 R3
+	LD R1 R2 R3
 sauts:
-	jmp controle
+	JMP controle
-	jequ R1 R2 io
+	JEQU R1 R2 io
-	jneq R1 R2 sauts
+	JNEQ R1 R2 sauts
-	jsup R1 R2 operations
+	JSUP R1 R2 operations
-	jinf R1 R2 controle
+	JINF R1 R2 controle
 controle:
-	call io
+	CALL io
-	ret
+	RET
 ```
 
 Produces
 
 ```
-00000000 10100110 00000000 00000000
+00000100 10100000 00000000 00000001
-00010100 10100000 00000000 01000101
+00010000 10100110 00000000 00000000
-00100000 10100110 00000000 00000000
+00100100 10100000 00000000 00100001
 01000000 10100110 00000000 00000000
 00110000 10100110 00000000 00000000
 01010000 10100110 00000000 00000000
 01100000 10100110 00000000 00000000
 01110000 10100110 00000000 00000000
-01000001 01001100 00000000 00000000
+01000000 10100110 00000000 00000000
-01010001 01001100 00000000 00000000
+01010000 10100110 00000000 00000000
-11000000 00000000 00000000 00000101
+11000000 00000000 00000000 00010000
-11010001 01010000 00000000 00000011
+11010000 10100000 00000000 00001001
-11100001 01010000 00000000 00000010
+11100000 10100000 00000000 00001011
-11110001 01010000 00000000 00001101
+11110000 10100000 00000000 00000001
-11000001 01000000 00000000 00000001
+11000000 10100000 00000000 00010000
-11010100 00000000 00000000 00000111
+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
@@ -71,5 +76,20 @@ xmake
 ## Run
 
 ```bash
-xmake run
+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>
@@ -12,7 +13,7 @@ enum TypeArithmetique {
 	Xor,
 	Sl,
 	Sr,
-	Mult,
+	Mul,
 };
 
 enum TypeMemoire {
@@ -38,7 +39,7 @@ static std::map<std::string, Instruction> INSTRUCTION_KEYS = {
 	{"xor", {Arithmetique, Xor}},
 	{"sl", {Arithmetique, Sl}},
 	{"sr", {Arithmetique, Sr}},
-	{"mult", {Arithmetique, Mult}},
+	{"mul", {Arithmetique, Mul}},
 	{"str", {Memoire, Str}},
 	{"ld", {Memoire, Ld}},
 	{"jmp", {SautControle, Jump}},
@@ -79,17 +80,11 @@ std::uint32_t Assembleur::ParseOperationImmediate(
 }
 
 std::uint32_t Assembleur::ParseJump(Instruction a_Instruction, const std::string& a_Label) {
-	std::int32_t jump = ParseLabel(a_Label) - a_Instruction.m_Line;
+	return IToInt(a_Instruction) | ParseLabel(a_Label) & 0x3FFFFFF;
-	if (jump < 0)
-		jump = std::abs(jump) & 0x7FFFFFF | 0x4000000;
-	return IToInt(a_Instruction) | jump;
 }
 
 std::uint32_t Assembleur::ParseJump(Instruction a_Instruction, std::uint8_t a_R1, std::uint8_t a_R2, const std::string& a_Label) {
-	std::int32_t jump = ParseLabel(a_Label) - a_Instruction.m_Line;
+	return IToInt(a_Instruction) | a_R1 << 23 | a_R2 << 20 | ParseLabel(a_Label) & 0xFFFFF;
-	if (jump < 0)
-		jump = std::abs(jump) & 0xFFFFF | 0x100000;
-	return IToInt(a_Instruction) | a_R1 << 24 | a_R2 << 21 | jump;
 }
 
 std::uint32_t Assembleur::ParseJump(Instruction a_Instruction) {
@@ -97,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;
 }
 
 
@@ -128,13 +123,15 @@ 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 !");
 	}
 
 	Instruction instruction = it->second;
-	instruction.m_Line = a_Line;
 
 	try {
 		switch (instruction.m_Instruction) {

src/Assembleur.h

@@ -13,7 +13,6 @@ enum TypeInstruction : std::uint8_t {
 struct Instruction {
 	TypeInstruction m_Instruction;
 	std::uint8_t m_SubInstruction;
-	std::uint32_t m_Line;
 };
 
 class Assembleur {

src/IO.cpp

@@ -99,12 +99,8 @@ void OutputFileLogisim(BinaryData& a_Data, const std::string& fileName, const st
 	for (std::uint32_t number : a_Data) {
 		if (cursor % 8 == 0) {
 			file << std::setfill('0') << std::setw(4) << std::hex << cursor << std::dec << ": ";
-			file << std::bitset<8>(number >> 24) << " " << std::bitset<8>(number >> 16) << " " << std::bitset<8>(number >> 8) << " "
-				 << std::bitset<8>(number) << " ";
-		} else {
-			file << std::bitset<8>(number >> 24) << " " << std::bitset<8>(number >> 16) << " " << std::bitset<8>(number >> 8) << " "
-				 << std::bitset<8>(number) << "\n";
 		}
-		cursor += 4;
+		file << std::hex << number << std::dec << (((cursor + 1) % 8 == 0) ? "\n" : " ");
+		cursor++;
 	}
 }

src/main.cpp

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

test.asm

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

xmake.lua

@@ -10,72 +10,6 @@ target("Assembleur")
     set_rundir(".")
     add_packages("argparse")
 
---
+    if is_os("windows") then
--- If you want to known more usage about xmake, please see https://xmake.io
+        add_ldflags("-static", "-static-libstdc++")
---
+    end
--- ## FAQ
---
--- You can enter the project directory firstly before building project.
---
---   $ cd projectdir
---
--- 1. How to build project?
---
---   $ xmake
---
--- 2. How to configure project?
---
---   $ xmake f -p [macosx|linux|iphoneos ..] -a [x86_64|i386|arm64 ..] -m [debug|release]
---
--- 3. Where is the build output directory?
---
---   The default output directory is `./build` and you can configure the output directory.
---
---   $ xmake f -o outputdir
---   $ xmake
---
--- 4. How to run and debug target after building project?
---
---   $ xmake run [targetname]
---   $ xmake run -d [targetname]
---
--- 5. How to install target to the system directory or other output directory?
---
---   $ xmake install
---   $ xmake install -o installdir
---
--- 6. Add some frequently-used compilation flags in xmake.lua
---
--- @code
---    -- add debug and release modes
---    add_rules("mode.debug", "mode.release")
---
---    -- add macro definition
---    add_defines("NDEBUG", "_GNU_SOURCE=1")
---
---    -- set warning all as error
---    set_warnings("all", "error")
---
---    -- set language: c99, c++11
---    set_languages("c99", "c++11")
---
---    -- set optimization: none, faster, fastest, smallest
---    set_optimize("fastest")
---
---    -- add include search directories
---    add_includedirs("/usr/include", "/usr/local/include")
---
---    -- add link libraries and search directories
---    add_links("tbox")
---    add_linkdirs("/usr/local/lib", "/usr/lib")
---
---    -- add system link libraries
---    add_syslinks("z", "pthread")
---
---    -- add compilation and link flags
---    add_cxflags("-stdnolib", "-fno-strict-aliasing")
---    add_ldflags("-L/usr/local/lib", "-lpthread", {force = true})
---
--- @endcode
---
-