Pre-break progress checkpoint

Author: Marcus Cornes

.gitignore

@@ -1,3 +1,6 @@
 .vscode/
 .DS_Store
 test_programs/
+asmx_venv/
+dist/
+TODO.md

asmx.py

@@ -0,0 +1,73 @@
+# asmx assembler
+# This file is the main entry point into the assembler
+
+def main():
+    import asmx.asmx_core.tokeniser as tokeniser
+    import asmx.asmx_core.parser as parser
+    import asmx.asmx_core.macros as macros
+    import asmx.asmx_core.codegen as codegen
+    import asmx.asmx_core.packages as packages
+
+    import argparse
+    from colorama import init, Fore, Style
+
+    init()
+
+    argparse_parser = argparse.ArgumentParser(
+         description="ASMX Assembler, for the ASMX VM platform."
+    )
+
+    # Optional flag
+    argparse_parser.add_argument("--docs", action="store_true", help="Shows documentation.")
+    argparse_parser.add_argument("--version", action="store_true", help="Shows the version number.")
+
+    # Positional args (required by default)
+    argparse_parser.add_argument("input_file", nargs="?", help="Source .asmx file to assemble.")
+    argparse_parser.add_argument("output_file", nargs="?", help="Output machine code file.")
+
+
+    args = argparse_parser.parse_args()
+
+    if args.docs:
+        # Shows docs
+        print(f"{Fore.RED}Sorry, the documentation is in progress.{Style.RESET_ALL}")
+        return
+
+    if args.version:
+        # Shows the version
+        print("ASMX Assembler version 0.1.0")
+        return
+
+    # If neither docs/version flags given, input_file AND output_file must be present
+    if not (args.input_file and args.output_file):
+        argparse_parser.error(f"{Fore.RED}The following arguments are required: input_file, output_file{Style.RESET_ALL}")
+
+    print(f"{Fore.GREEN}Assembling {args.input_file} -> {args.output_file}{Style.RESET_ALL}")
+
+
+    packages.load_all_packages()
+
+
+    source_file_location = args.input_file
+    dest_file_location = args.output_file
+    source_file = tokeniser.read_source_file(source_file_location)
+
+
+    results = []
+
+    for line_num, line in source_file:
+            tokens = tokeniser.tokenize_line_with_strings(line)
+            try:
+                results.append(parser.parse_line(tokens, line_num))
+            except SyntaxError as e:
+                print(f"{Fore.RED}Syntax error: {e}{Style.RESET_ALL}")
+                break
+
+    instructions = macros.dispatch_macros(results)
+
+    address_table = codegen.find_labels(instructions)
+
+    generated_code = codegen.generate_code(instructions, address_table)
+
+    codegen.write_output_file(dest_file_location, generated_code)
+    print(f"{Fore.GREEN}Successfully assembled {args.input_file} -> {args.output_file}{Style.RESET_ALL}")

asmx/__init__.py

@@ -1,7 +1,8 @@
-RESET = "\033[0m"
-RED = "\033[31m"
-GREEN = "\033[32m"
-YELLOW = "\033[33m"
+from colorama import init, Fore, Style
+RESET = Style.RESET_ALL
+RED = Fore.RED
+GREEN = Fore.GREEN
+YELLOW = Fore.YELLOW
 
 def find_labels(instructions):
     label_addresses = {}

asmx/asmx.py

@@ -5,17 +5,17 @@
 TEMP_MIN = "a1"
 TEMP_MAX = "a2"
 
-RESET = "\033[0m"
-RED = "\033[31m"
-GREEN = "\033[32m"
-YELLOW = "\033[33m"
+from colorama import init, Fore, Style
+RESET = Style.RESET_ALL
+RED = Fore.RED
+GREEN = Fore.GREEN
+YELLOW = Fore.YELLOW
 
 def dispatch_macros(instruction_list, max_passes=50):
     i = 0
     passes = 0
 
     while i < len(instruction_list):
-        print(f"{YELLOW}[Macro Pass Count] Macro pass round: {passes}")
         instruction = instruction_list[i]
         if passes > max_passes:
             print(f"{RED}[Macro Recursion] Macro expansion exceeded max passes. Possible infinite recursion.{RESET}")
@@ -28,7 +28,6 @@ def dispatch_macros(instruction_list, max_passes=50):
         if instruction.get("type") == "macro":
             namespace = instruction["namespace"]
             subcommand = instruction["subcommand"].lower()
-            print(f"{GREEN}[Macro Notification] Processing macro '{namespace} {subcommand}'{RESET}")
 
             registry = packages.get_all_macro_registries().get(namespace)
             if not registry:
@@ -56,9 +55,6 @@ def dispatch_macros(instruction_list, max_passes=50):
             expansion = None
 
         if expansion:
-            print(f"{GREEN}[Expansion] Expansion result for {instruction}:{RESET}")
-            print(expansion)
-
             # Convert expanded lines to parsed instruction dicts
             parsed_instructions = []
             for line in expansion:
@@ -85,7 +81,6 @@ def dispatch_macros(instruction_list, max_passes=50):
     return instruction_list
 
 def expand_immediates(instruction):
-    print("Immediate is being expanded.")
     args = instruction.get("args", [])
     opcode = instruction["opcode"]
 
@@ -130,8 +125,6 @@ def expand_rand(instruction):
     if not isinstance(min_val, int) and not isinstance(max_val, int):
         return None  # Stop expanding here
 
-    print("RAND is being expanded.")
-
     expanded_lines = []
 
 

asmx/asmx_core/__init__.py

@@ -2,13 +2,16 @@
 import importlib.util
 from . import parser
 
-macro_packages = {}
-RESET = "\033[0m"
-RED = "\033[31m"
-GREEN = "\033[32m"
-YELLOW = "\033[33m"
 
-def load_all_packages(package_dir="packages"):
+macro_packages = {}
+from colorama import init, Fore, Style
+RESET = Style.RESET_ALL
+RED = Fore.RED
+GREEN = Fore.GREEN
+YELLOW = Fore.YELLOW
+
+def load_all_packages():
+    package_dir = os.path.join(os.path.dirname(__file__), "packages")
 
     for filename in os.listdir(package_dir):
         if not filename.endswith(".py") or filename.startswith("__"):

asmx_core/codegen.py asmx/asmx_core/codegen.pyasmx_core/codegen.py renamed to asmx/asmx_core/codegen.py

@@ -18,10 +18,11 @@
     "hardcall"
 ]
 
-RESET = "\033[0m"
-RED = "\033[31m"
-GREEN = "\033[32m"
-YELLOW = "\033[33m"
+from colorama import init, Fore, Style
+RESET = Style.RESET_ALL
+RED = Fore.RED
+GREEN = Fore.GREEN
+YELLOW = Fore.YELLOW
 
 valid_user_registers = { f"u{i}" for i in range(1, 9) }
 valid_auto_registers = { f"a{i}" for i in range(1, 5) }