Updated STRUCTURE.md, README.md, MACRO_USAGE.md files, added BSD implementation of library and examples, changed folder structure for better navigation in repository, changed MakeFile for folder structure and new implementation of library

Author: lina-torovoltas

MACRO_USAGE.md

@@ -35,6 +35,7 @@ clr reg1, reg2
 **Usage example:**
 
 ```asm
+clr ax, bx      ; sets ax and bx to 0
 clr eax, ebx    ; sets eax and ebx to 0
 clr rax, rdi    ; sets rax and rdi to 0
 clr r7, r0      ; sets r7 and r0 to 0
@@ -60,11 +61,11 @@ pop reg3, reg2, reg1
 
 **Usage example:**
 
-For x86_64:
+For x16:
 ```
-push rax, rdi, rsi
+push ax, bx, cx
 ...
-pop rsi, rdi, rax
+pop cx, ax, bx
 ```
 
 For x86:
@@ -74,6 +75,13 @@ push eax, edi, esi
 pop esi, edi, eax
 ```
 
+For x86_64:
+```
+push rax, rdi, rsi
+...
+pop rsi, rdi, rax
+```
+
 For ARM:
 ```
 push r0, r1, r2
@@ -171,7 +179,7 @@ print str, str_len
 
 **Arguments:**  
 `str` — pointer to the string or string literal to print.</br>
-`str_len` — length of the string in bytes, given as a number or pointer. (not required for x16)
+`str_len` — length of the string in bytes, given as a number or pointer (not required for DOS).
 
 
 **Usage example:**
@@ -218,7 +226,7 @@ printnum number
 
 **Note:**
 
-Not available in the library for ARM32 and ARM64.
+Not available in the library for Linux (ARM 32-bit and ARM 64-bit).
 
 
 **Arguments:**</br>
@@ -245,7 +253,7 @@ time
 
 **Note:**
 
-Not available in the library for x16, ARM32 and ARM64.
+Not available in the library for DOS, Linux (ARM 32-bit and ARM 64-bit), and BSD.
 
 
 
@@ -260,7 +268,7 @@ run command
 
 **Note:**
 
-Not available in the library for x16, ARM32 and ARM64.
+Not available in the library for DOS and Linux (ARM 32-bit and ARM 64-bit).
 
 
 **Arguments:**</br>

Makefile

@@ -1,85 +1,67 @@
-SRC_x16_com = examples/examples_x16_com
-SRC_x16_exe = examples/examples_x16_exe
-SRC_x86 = examples/examples_x86
-SRC_x64 = examples/examples_x64
-SRC_arm32 = examples/examples_arm32
-SRC_arm64 = examples/examples_arm64
+DIRS_LINUX = examples_arm32 examples_arm64 examples_x64 examples_x86
+DIRS_BSD = examples_x64
+DIRS_DOS = examples_x16_com examples_x16_exe
 
-BUILD_DIR = build
-BUILD_x16_com = $(BUILD_DIR)/examples_x16_com
-BUILD_x16_exe = $(BUILD_DIR)/examples_x16_exe
-BUILD_x86 = $(BUILD_DIR)/examples_x86
-BUILD_x64 = $(BUILD_DIR)/examples_x64
-BUILD_arm32 = $(BUILD_DIR)/examples_arm32
-BUILD_arm64 = $(BUILD_DIR)/examples_arm64
+ASM_LINUX_X64   = $(wildcard examples/Linux/examples_x64/*.asm)
+ASM_LINUX_X86   = $(wildcard examples/Linux/examples_x86/*.asm)
+ASM_LINUX_ARM32 = $(wildcard examples/Linux/examples_arm32/*.asm)
+ASM_LINUX_ARM64 = $(wildcard examples/Linux/examples_arm64/*.asm)
+ASM_BSD_X64 = $(wildcard examples/BSD/examples_x64/*.asm)
+ASM_DOS_COM = $(wildcard examples/DOS/examples_x16_com/*.asm)
+ASM_DOS_EXE = $(wildcard examples/DOS/examples_x16_exe/*.asm)
 
-FASM = fasm
-FASMA = fasmarm
 
-all: x16_com x16_exe x86 x64 arm32 arm64
-.PHONY: x16_com x16_exe x86 x64 arm32 arm64 all clean check_tools check_dirs
-
-check_tools:
-	@command -v $(FASM) >/dev/null 2>&1 || { echo "Error: $(FASM) is not installed or not in PATH"; exit 1; }
-	@command -v $(FASMA) >/dev/null 2>&1 || { echo "Error: $(FASMA) is not installed or not in PATH"; exit 1; }
-
-check_dirs:
-	@for dir in $(SRC_x16_com) $(SRC_x16_exe) $(SRC_x86) $(SRC_x64) $(SRC_arm32) $(SRC_arm64); do \
-		if [ ! -d $$dir ]; then \
-			echo "Error: Source directory '$$dir' does not exist"; exit 1; \
-		fi \
+Linux:
+	@for dir in $(DIRS_LINUX); do \
+		mkdir -p build/Linux/$$dir >/dev/null 2>&1; \
 	done
-
-x16_com: check_tools check_dirs
-	@mkdir -p $(BUILD_x16_com)
-	@for file in $(SRC_x16_com)/*.asm; do \
-		base=$$(basename $$file .asm); \
-		output="$(BUILD_x16_com)/$$base.com"; \
-		echo "Building $$file -> $$output"; \
-		$(FASM) "$$file" "$$output" || exit 1; \
+	@for src in $(ASM_LINUX_X64); do \
+		dst=build/Linux/$${src#examples/Linux/}; \
+		dst=$${dst%.asm}; \
+		fasm $$src $$dst; \
 	done
-
-x16_exe: check_tools check_dirs
-	@mkdir -p $(BUILD_x16_exe)
-	@for file in $(SRC_x16_exe)/*.asm; do \
-		base=$$(basename $$file .asm); \
-		output="$(BUILD_x16_exe)/$$base.exe"; \
-		echo "Building $$file -> $$output"; \
-		$(FASM) "$$file" "$$output" || exit 1; \
+	@for src in $(ASM_LINUX_X86); do \
+		dst=build/Linux/$${src#examples/Linux/}; \
+		dst=$${dst%.asm}; \
+		fasm $$src $$dst; \
 	done
-
-x86: check_tools check_dirs
-	@mkdir -p $(BUILD_x86)
-	@for file in $(SRC_x86)/*.asm; do \
-		output=$(BUILD_x86)/$$(basename $$file .asm); \
-		echo "Building $$file -> $$output"; \
-		$(FASM) $$file $$output || exit 1; \
+	@for src in $(ASM_LINUX_ARM32); do \
+		dst=build/Linux/$${src#examples/Linux/}; \
+		dst=$${dst%.asm}; \
+		fasmarm $$src $$dst; \
 	done
-
-x64: check_tools check_dirs
-	@mkdir -p $(BUILD_x64)
-	@for file in $(SRC_x64)/*.asm; do \
-		output=$(BUILD_x64)/$$(basename $$file .asm); \
-		echo "Building $$file -> $$output"; \
-		$(FASM) $$file $$output || exit 1; \
+	@for src in $(ASM_LINUX_ARM64); do \
+		dst=build/Linux/$${src#examples/Linux/}; \
+		dst=$${dst%.asm}; \
+		fasmarm $$src $$dst; \
 	done
 
-arm32: check_tools check_dirs
-	@mkdir -p $(BUILD_arm32)
-	@for file in $(SRC_arm32)/*.asm; do \
-		output=$(BUILD_arm32)/$$(basename $$file .asm); \
-		echo "Building $$file -> $$output"; \
-		$(FASMA) $$file $$output || exit 1; \
+BSD:
+	@for dir in $(DIRS_BSD); do \
+		mkdir -p build/BSD/$$dir >/dev/null 2>&1; \
+	done
+	@for src in $(ASM_BSD_X64); do \
+		dst=build/BSD/$${src#examples/BSD/}; \
+		dst=$${dst%.asm}; \
+		fasm $$src $$dst; \
 	done
 
-arm64: check_tools check_dirs
-	@mkdir -p $(BUILD_arm64)
-	@for file in $(SRC_arm64)/*.asm; do \
-		output=$(BUILD_arm64)/$$(basename $$file .asm); \
-		echo "Building $$file -> $$output"; \
-		$(FASMA) $$file $$output || exit 1; \
+DOS:
+	@for dir in $(DIRS_DOS); do \
+		mkdir -p build/DOS/$$dir >/dev/null 2>&1; \
+	done
+	@for src in $(ASM_DOS_COM); do \
+		dst=build/DOS/$${src#examples/DOS/}; \
+		dst=$${dst%.asm}.com; \
+		fasm $$src $$dst; \
 	done
+	@for src in $(ASM_DOS_EXE); do \
+		dst=build/DOS/$${src#examples/DOS/}; \
+		dst=$${dst%.asm}.exe; \
+		fasm $$src $$dst; \
+	done
+
+all: Linux BSD DOS
 
 clean:
-	@rm -rf $(BUILD_DIR)
-	@echo "Cleaned build directories"
+	@rm -rf build

README.md

@@ -2,33 +2,34 @@
 
 ![Language](https://img.shields.io/badge/language%20-%20Assembly-red)
 ![CPU](https://img.shields.io/badge/CPU-x16%2C%20x86%2C%20x64%2C%20ARM32%2C%20ARM64-orange)
-![OS](https://img.shields.io/badge/OS-Linux%2C%20DOS-0078D4)
+![OS](https://img.shields.io/badge/OS-Linux%2C%20DOS%2C%20BSD-0078D4)
 ![License](https://img.shields.io/github/license/lina-torovoltas/FasmMacrosLib)
 ![GitHub release](https://img.shields.io/github/v/release/lina-torovoltas/FasmMacrosLib)
 ![Downloads](https://img.shields.io/github/downloads/lina-torovoltas/FasmMacrosLib/total)</br>
-FasmMacroLib is a macro library designed to simplify FASM programming upon Linux and DOS.</br>
-It supports x16 for DOS, and x86, x64, ARM and ARM64 for Linux.
+FasmMacroLib is a macro library designed to simplify FASM programming upon Linux, DOS and BSD.</br>
+It supports x86, x64, ARM and ARM64 for Linux, x16 for DOS and x64 for BSD.
 
 ## Installation
 
-Just include the `macrolib` file at the top of thy `.asm` file, depending upon thine architecture:
+Just include the macrolib file at the top of thy .asm file, depending upon thine OS and architecture:
 
 ```asm
-include 'macrolib/macrolib_x16.inc'       ; for x16
-include 'macrolib/macrolib_x86.inc'       ; for x86
-include 'macrolib/macrolib_x64.inc'       ; for x64
-include 'macrolib/macrolib_arm32.inc'     ; for arm32
-include 'macrolib/macrolib_arm64.inc'     ; for arm64
+include 'linux_x86.inc'       ; for Linux x86
+include 'linux_x64.inc'       ; for Linux x64
+include 'linux_arm32.inc'     ; for Linux arm32
+include 'linux_arm64.inc'     ; for Linux arm64
+include 'dos_x16.inc'         ; for DOS x16
+include 'bsd_x64.inc'         ; for BSD x64
 ```
 
 ## Dependencies
 
-- Linux x86, x86_64, ARM32 or ARM64 operating system  
 - `make` utility for building
 - `fasm` assembler for x16, x86 and x64 targets
 - `fasmarm` assembler for ARM32 and ARM64 targets
+- `brandelf` utility for marking ELF binaries as BSD-compatible
 
-Make sure both `make`, `fasm` and `fasmarm` are installed and available in thy system PATH before building.
+Make sure both `make`, `fasm`, `fasmarm` and `brandelf` are installed and available in thy system PATH before building.
 
 ## Usage
 
@@ -39,18 +40,24 @@ Alternatively, thou canst build them thyself.
 
 ## Building examples
 
-To build examples for a chosen architecture (e.g., x86):
+To build examples for a chosen operating system (e.g., Linux):
 ```bash
 cd FasmMacroLib
-make x86
+make Linux
 ```
 
-To build examples for all supported architectures at once:
+To build examples for all supported operating systems at once:
 ```bash
 cd FasmMacroLib
 make all
 ```
 
+### Note:
+To make the binaries work upon BSD, thou must mark them using brandelf:
+```bash
+brandelf -t FreeBSD path/to/binary
+```
+
 ## Contributing
 
 Contributions are welcome!</br>