From 20162ab02caa3b04654752e9bbfdde8928f8d379 Mon Sep 17 00:00:00 2001
From: andromeda <andromeda@lenovo>
Date: Tue, 24 Mar 2026 22:33:14 +0100
Subject: [PATCH] clean up labels

---
 twasm/asm/main.asm | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/twasm/asm/main.asm b/twasm/asm/main.asm
index f3f99e2..ee1854e 100644
--- a/twasm/asm/main.asm
+++ b/twasm/asm/main.asm
@@ -175,7 +175,7 @@ assemble:
     and di, 0xFF00
     cmp di, 0x1000 ; check if token is a memory address
     pop rdi        ; di = next tte
-    je .operator_1_memory_access
+    je .operator_1_memory
 
     push rdx
     ; di = next tte
@@ -194,9 +194,9 @@ assemble:
     jmp .loop
 
   ; TODO figure out if this is relevant
-  .operator_1_memory_access:
+  .operator_1_memory:
     push rsi
-    mov rsi, .msg_operator_1_memory_access
+    mov rsi, .msg_operator_1_memory
     call print.debug
     pop rsi
     jmp .unsupported_memory_access
@@ -245,7 +245,7 @@ assemble:
     and di, 0xFF00
     cmp di, 0x1000 ; check if token is a memory address
     pop rdi        ; di = next tte
-    je .operator_2_memory_access
+    je .operator_2_memory
 
     push rcx
     ; di = next tte
@@ -263,9 +263,9 @@ assemble:
     jge .break
     jmp .loop
 
-  .operator_2_memory_access:
+  .operator_2_memory:
     push rsi
-    mov rsi, .msg_operator_2_memory_access
+    mov rsi, .msg_operator_2_memory
     call print.debug
     pop rsi
 
@@ -316,7 +316,7 @@ assemble:
     ; al = type of token
 
     cmp al, 0x02
-    je .operator_2_memory_access_register
+    je .operator_2_memory_register
 
     pop rax ; rax = number of tokens processed
     pop rdi ; rdi = total number of tokens
@@ -325,9 +325,9 @@ assemble:
     jge .break
     jmp .loop
 
-  .operator_2_memory_access_register:
+  .operator_2_memory_register:
     push rsi
-    mov rsi, .msg_operator_2_memory_access_register
+    mov rsi, .msg_operator_2_memory_register
     call print.debug
     pop rsi
 
@@ -377,7 +377,7 @@ assemble:
     and di, 0xFF00
     cmp di, 0x1000 ; check if token is a memory address
     pop rdi        ; di = next tte
-    je .operator_2_register_memory_access
+    je .operator_2_register_memory
 
     ; di = next tte
     call get_tte_type
@@ -393,9 +393,9 @@ assemble:
     jge .break
     jmp .loop
 
-  .operator_2_register_memory_access:
+  .operator_2_register_memory:
     push rsi
-    mov rsi, .msg_operator_2_register_memory_access
+    mov rsi, .msg_operator_2_register_memory
     call print.debug
     pop rsi
 
@@ -479,13 +479,13 @@ assemble:
   .msg_unsupported_memory_access db "unsupported memory access, aborting", 0x0A, 0x00
   .msg_operator_0 db "operator_0", 0x0A, 0x00
   .msg_operator_1 db "operator_1", 0x0A, 0x00
-  .msg_operator_1_memory_access db "operator_1_memory_access", 0x0A, 0x00
+  .msg_operator_1_memory db "operator_1_memory", 0x0A, 0x00
   .msg_operator_1_register db "operator_1_register", 0x0A, 0x00
   .msg_operator_2 db "operator_2", 0x0A, 0x00
-  .msg_operator_2_memory_access db "operator_2_memory_access", 0x0A, 0x00
-  .msg_operator_2_memory_access_register db "operator_2_memory_access_register", 0x0A, 0x00
+  .msg_operator_2_memory db "operator_2_memory", 0x0A, 0x00
+  .msg_operator_2_memory_register db "operator_2_memory_register", 0x0A, 0x00
   .msg_operator_2_register db "operator_2_register", 0x0A, 0x00
-  .msg_operator_2_register_memory_access db "operator_2_register_memory_access", 0x0A, 0x00
+  .msg_operator_2_register_memory db "operator_2_register_memory", 0x0A, 0x00
   .msg_operator_2_register_register db "operator_2_register_register", 0x0A, 0x00
 
 ; ------------------------------------------------------------------------------