Switch to new amd64 defines.

Author: stikonas

amd64/amd64_defs.M1

@@ -15,87 +15,85 @@
 ## along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
 
 
-DEFINE ADD_IMMEDIATE_to_rax 4805
-DEFINE ADD_IMMEDIATE_to_rbp 4881C5
-DEFINE ADD_rax_to_rbx 4801C3
-DEFINE ADD_rbp_to_rax 4801E8
-DEFINE ADD_rbx_to_rax 4801D8
-DEFINE AND_rax_rbx 4821D8
-DEFINE CALL_IMMEDIATE E8
-DEFINE CALL_rax FFD0
-DEFINE CMP 4839C3
-DEFINE COPY_rax_to_rcx 4889C1
-DEFINE COPY_rax_to_rdi 4889C7
-DEFINE COPY_rbx_to_rax 4889D8
-DEFINE COPY_rbp_to_rax 4889E8
-DEFINE COPY_rbx_to_rdi 4889DF
-DEFINE COPY_rdi_to_rbp 4889FD
-DEFINE COPY_rsp_to_rbp 4889E5
-DEFINE COPY_RSP_to_RDI 4889E7
-DEFINE CQTO 4899
-DEFINE DIVIDE_rax_by_rbx_into_rax 48F7F3
-DEFINE DIVIDES_rax_by_rbx_into_rax 48F7FB
-DEFINE JUMP E9
-DEFINE JUMP_EQ 0F84
-DEFINE JUMP_NE 0F85
-DEFINE LOAD_BASE_ADDRESS_rax 488D85
-DEFINE LOAD_BYTE 480FBE00
-DEFINE LOAD_BYTE_rbx 480FBE1B
-DEFINE LOAD_EFFECTIVE_ADDRESS_rax 488D8424
-DEFINE LOAD_EFFECTIVE_ADDRESS_rdi 488DBC24
-DEFINE LOAD_EFFECTIVE_ADDRESS_rdx 488D9424
-DEFINE LOAD_EFFECTIVE_ADDRESS_rsi 488DB424
-DEFINE LOAD_IMMEDIATE_r10 48C7C2
-DEFINE LOAD_IMMEDIATE_rax 48C7C0
-DEFINE LOAD_IMMEDIATE_rbx 48C7C3
-DEFINE LOAD_IMMEDIATE_rdi 48C7C7
-DEFINE LOAD_IMMEDIATE_rdx 48C7C2
-DEFINE LOAD_IMMEDIATE_rsi 48C7C6
-DEFINE LOAD_INTEGER 488B00
-DEFINE LOAD_INTEGER_rbx 488B1B
-DEFINE LOAD_INTEGER_rdi 488B3F
-DEFINE LOAD_INTEGER_rdx 488B12
-DEFINE LOAD_INTEGER_rsi 488B36
-DEFINE LOAD_RSP_IMMEDIATE_into_rax 488B8424
-DEFINE MODULUS_rax_from_rbx_into_rbx 48F7F3
-DEFINE MODULUSS_rax_from_rbx_into_rbx 48F7FB
-DEFINE MOVE_rbx_to_rax 4889D8
-DEFINE MOVE_rdx_to_rax 4889D0
-DEFINE MOVEZX 480FB6C0
-DEFINE MOVESX 4863C0
-DEFINE MULTIPLY_rax_by_rbx_into_rax 48F7EB
-DEFINE MULTIPLYS_rax_by_rbx_into_rax 48F7E3
+DEFINE add_rax, 4805
+DEFINE add_rbp, 4881C5
+DEFINE add_rax,rbx 4801D8
+DEFINE add_rax,rbp 4801E8
+DEFINE add_rbx,rax 4801C3
+DEFINE and_rax,rbx 4821D8
+DEFINE call E8
+DEFINE call_rax FFD0
+DEFINE cmp_rbx,rax 4839C3
+DEFINE cqo 4899
+DEFINE div_rbx 48F7F3
+DEFINE idiv_rbx 48F7FB
+DEFINE jmp E9
+DEFINE je 0F84
+DEFINE jne 0F85
+DEFINE lea_rax,[rbp+DWORD] 488D85
+DEFINE lea_rax,[rsp+DWORD] 488D8424
+DEFINE lea_rdi,[rsp+DWORD] 488DBC24
+DEFINE lea_rdx,[rsp+DWORD] 488D9424
+DEFINE lea_rsi,[rsp+DWORD] 488DB424
+DEFINE mov_rax, 48C7C0
+DEFINE mov_rbx, 48C7C3
+DEFINE mov_rdi, 48C7C7
+DEFINE mov_rdx, 48C7C2
+DEFINE mov_rsi, 48C7C6
+DEFINE mov_r10, 49C7C2
+DEFINE mov_rax,rdx 4889D0
+DEFINE mov_rax,rbx 4889D8
+DEFINE mov_rax,rbp 4889E8
+DEFINE mov_rbp,rdi 4889FD
+DEFINE mov_rbp,rsp 4889E5
+DEFINE mov_rcx,rax 4889C1
+DEFINE mov_rdi,rax 4889C7
+DEFINE mov_rdi,rbx 4889DF
+DEFINE mov_rdi,rsp 4889E7
+DEFINE mov_[rbx],al 8803
+DEFINE mov_[rbx],rax 488903
+DEFINE mov_rax,[rax] 488B00
+DEFINE mov_rax,[rip+DWORD] 488B05
+DEFINE mov_rbx,[rbx] 488B1B
+DEFINE mov_rdi,[rdi] 488B3F
+DEFINE mov_rdx,[rdx] 488B12
+DEFINE mov_rsi,[rsi] 488B36
+DEFINE mov_rax,[rsp+DWORD] 488B8424
+DEFINE movzx_rax,al 480FB6C0
+DEFINE movsxd_rax,eax 4863C0
+DEFINE movsx_rax,BYTE_PTR_[rax] 480FBE00
+DEFINE movsx_rbx,BYTE_PTR_[rbx] 480FBE1B
+DEFINE imul_rbx 48F7EB
+DEFINE mul_rbx 48F7E3
 DEFINE NULL 0000000000000000
-DEFINE NOT_rax 48F7D0
-DEFINE OR_rax_rbx 4809D8
-DEFINE POP_RAX 58
-DEFINE POP_RBP 5D
-DEFINE POP_RBX 5B
-DEFINE POP_RDI 5F
-DEFINE PUSH_RAX 50
-DEFINE PUSH_RBP 55
-DEFINE PUSH_RBX 53
-DEFINE PUSH_RDI 57
-DEFINE RETURN C3
-DEFINE SAL_rax_Immediate8 48C1E0
-DEFINE SHL_rax_cl 48D3E0
-DEFINE SAL_rax_cl 48D3F0
-DEFINE SHR_rax_cl 48D3E8
-DEFINE SAR_rax_cl 48D3F8
-DEFINE SETA 0F97C0
-DEFINE SETAE 0F93C0
-DEFINE SETB 0F92C0
-DEFINE SETBE 0F96C0
-DEFINE SETE 0F94C0
-DEFINE SETG 0F9FC0
-DEFINE SETGE 0F9DC0
-DEFINE SETL 0F9CC0
-DEFINE SETLE 0F9EC0
-DEFINE SETNE 0F95C0
-DEFINE STORE_CHAR 8803
-DEFINE STORE_INTEGER 488903
-DEFINE SUBTRACT_rax_from_rbx_into_rbx 4829C3
-DEFINE SYSCALL 0F05
-DEFINE TEST 4885C0
-DEFINE XCHG_rax_rbx 4893
-DEFINE XOR_rbx_rax_into_rax 4831D8
+DEFINE not_rax 48F7D0
+DEFINE or_rax,rbx 4809D8
+DEFINE pop_rax 58
+DEFINE pop_rbp 5D
+DEFINE pop_rbx 5B
+DEFINE pop_rdi 5F
+DEFINE push_rax 50
+DEFINE push_rbp 55
+DEFINE push_rbx 53
+DEFINE push_rdi 57
+DEFINE ret C3
+DEFINE sal_rax, 48C1E0
+DEFINE shl_rax,cl 48D3E0
+DEFINE sal_rax,cl 48D3F0
+DEFINE shr_rax,cl 48D3E8
+DEFINE sar_rax,cl 48D3F8
+DEFINE seta_al 0F97C0
+DEFINE setae_al 0F93C0
+DEFINE setb_al 0F92C0
+DEFINE setbe_al 0F96C0
+DEFINE sete_al 0F94C0
+DEFINE setg_al 0F9FC0
+DEFINE setge_al 0F9DC0
+DEFINE setl_al 0F9CC0
+DEFINE setle_al 0F9EC0
+DEFINE setne_al 0F95C0
+DEFINE sub_rbx,rax 4829C3
+DEFINE syscall 0F05
+DEFINE test_rax,rax 4885C0
+DEFINE xchg_rbx,rax 4893
+DEFINE xor_rax,rbx 4831D8

amd64/libc-core.M1

@@ -16,32 +16,32 @@
 
 :_start
 
-	COPY_rsp_to_rbp             ; Protect rsp
+	mov_rbp,rsp                 ; Protect rsp
 
 	;; Prepare argv
-	LOAD_BASE_ADDRESS_rax %8    ; ARGV_address = RBP + 8
-	PUSH_RAX                    ; Put argv on the stack
+	lea_rax,[rbp+DWORD] %8      ; ARGV_address = RBP + 8
+	push_rax                    ; Put argv on the stack
 
 	;; Prepare envp
-	COPY_rbp_to_rax             ; Address we need to load from
-	LOAD_INTEGER                ; Get ARGC
-	ADD_IMMEDIATE_to_rax %2     ; OFFSET = ARGC + 2
-	SAL_rax_Immediate8 !3       ; OFFSET = OFFSET * WORDSIZE
-	ADD_rbp_to_rax              ; ENVP_address = RSP + OFFSET
-	PUSH_RAX                    ; Put envp on the stack
+	mov_rax,rbp                 ; Address we need to load from
+	mov_rax,[rax]               ; Get ARGC
+	add_rax, %2                 ; OFFSET = ARGC + 2
+	sal_rax, !3                 ; OFFSET = OFFSET * WORDSIZE
+	add_rax,rbp                 ; ENVP_address = RSP + OFFSET
+	push_rax                    ; Put envp on the stack
 
 	;; Stack offset
-	ADD_IMMEDIATE_to_rbp %8     ; Fix rbp
+	add_rbp, %8                 ; Fix rbp
 
 	;; Perform the main loop
-	CALL_IMMEDIATE %FUNCTION_main
+	call %FUNCTION_main
 
-	PUSH_RAX                    ; Put return value on the stack
-	PUSH_RAX                    ; So that _exit gets it
+	push_rax                    ; Put return value on the stack
+	push_rax                    ; So that _exit gets it
 
 :FUNCTION_exit
 :FUNCTION__exit
-	POP_RBX
-	POP_RDI
-	LOAD_IMMEDIATE_rax %0x3C
-	SYSCALL
+	pop_rbx
+	pop_rdi
+	mov_rax, %0x3C
+	syscall

amd64/libc-full.M1

@@ -16,36 +16,36 @@
 
 :_start
 
-	COPY_rsp_to_rbp             ; Protect rsp
+	mov_rbp,rsp                 ; Protect rsp
 
 	;; Prepare argv
-	LOAD_BASE_ADDRESS_rax %8    ; ARGV_address = RBP + 8
-	PUSH_RAX                    ; Put argv on the stack
+	lea_rax,[rbp+DWORD] %8      ; ARGV_address = RBP + 8
+	push_rax                    ; Put argv on the stack
 
 	;; Prepare envp
-	COPY_rbp_to_rax             ; Address we need to load from
-	LOAD_INTEGER                ; Get ARGC
-	ADD_IMMEDIATE_to_rax %2     ; OFFSET = ARGC + 2
-	SAL_rax_Immediate8 !3       ; OFFSET = OFFSET * WORDSIZE
-	ADD_rbp_to_rax              ; ENVP_address = RSP + OFFSET
-	PUSH_RAX                    ; Put envp on the stack
+	mov_rax,rbp                 ; Address we need to load from
+	mov_rax,[rax]               ; Get ARGC
+	add_rax, %2                 ; OFFSET = ARGC + 2
+	sal_rax, !3                 ; OFFSET = OFFSET * WORDSIZE
+	add_rax,rbp                 ; ENVP_address = RSP + OFFSET
+	push_rax                    ; Put envp on the stack
 
 	;; Stack offset
-	ADD_IMMEDIATE_to_rbp %8     ; Fix rbp
+	add_rbp, %8                 ; Fix rbp
 
 	;; Setup for FILE*
-	CALL_IMMEDIATE %FUNCTION___init_io
+	call %FUNCTION___init_io
 
 	;; Perform the main loop
-	CALL_IMMEDIATE %FUNCTION_main
+	call %FUNCTION_main
 
-	PUSH_RAX                    ; Put return value on the stack
-	PUSH_RAX                    ; So that _exit gets it
+	push_rax                    ; Put return value on the stack
+	push_rax                    ; So that _exit gets it
 
 :FUNCTION_exit
-	CALL_IMMEDIATE %FUNCTION___kill_io
+	call %FUNCTION___kill_io
 :FUNCTION__exit
-	POP_RBX
-	POP_RDI
-	LOAD_IMMEDIATE_rax %0x3C
-	SYSCALL
+	pop_rbx
+	pop_rdi
+	mov_rax, %0x3C
+	syscall

amd64/linux/bootstrap.c

@@ -28,29 +28,29 @@
 
 int fgetc(FILE* f)
 {
-	asm("LOAD_EFFECTIVE_ADDRESS_rdi %8"
-	    "LOAD_INTEGER_rdi"
-	    "LOAD_IMMEDIATE_rax %0"
-	    "PUSH_RAX"
-	    "LOAD_EFFECTIVE_ADDRESS_rsi %0"
-	    "LOAD_IMMEDIATE_rdx %1"
-	    "SYSCALL"
-	    "LOAD_IMMEDIATE_rbx %0"
-	    "CMP"
-	    "POP_RAX"
-	    "JUMP_NE %FUNCTION_fgetc_Done"
-	    "LOAD_IMMEDIATE_rax %-1"
+	asm("lea_rdi,[rsp+DWORD] %8"
+	    "mov_rdi,[rdi]"
+	    "mov_rax, %0"
+	    "push_rax"
+	    "lea_rsi,[rsp+DWORD] %0"
+	    "mov_rdx, %1"
+	    "syscall"
+	    "mov_rbx, %0"
+	    "cmp_rbx,rax"
+	    "pop_rax"
+	    "jne %FUNCTION_fgetc_Done"
+	    "mov_rax, %-1"
 	    ":FUNCTION_fgetc_Done");
 }
 
 void fputc(char s, FILE* f)
 {
-	asm("LOAD_IMMEDIATE_rax %1"
-	    "LOAD_EFFECTIVE_ADDRESS_rdi %8"
-	    "LOAD_INTEGER_rdi"
-	    "LOAD_EFFECTIVE_ADDRESS_rsi %16"
-	    "LOAD_IMMEDIATE_rdx %1"
-	    "SYSCALL");
+	asm("mov_rax, %1"
+	    "lea_rdi,[rsp+DWORD] %8"
+	    "mov_rdi,[rdi]"
+	    "lea_rsi,[rsp+DWORD] %16"
+	    "mov_rdx, %1"
+	    "syscall");
 }
 
 void fputs(char* s, FILE* f)
@@ -64,14 +64,14 @@ void fputs(char* s, FILE* f)
 
 FILE* open(char* name, int flag, int mode)
 {
-	asm("LOAD_EFFECTIVE_ADDRESS_rdi %24"
-	    "LOAD_INTEGER_rdi"
-	    "LOAD_EFFECTIVE_ADDRESS_rsi %16"
-	    "LOAD_INTEGER_rsi"
-	    "LOAD_EFFECTIVE_ADDRESS_rdx %8"
-	    "LOAD_INTEGER_rdx"
-	    "LOAD_IMMEDIATE_rax %2"
-	    "SYSCALL");
+	asm("lea_rdi,[rsp+DWORD] %24"
+	    "mov_rdi,[rdi]"
+	    "lea_rsi,[rsp+DWORD] %16"
+	    "mov_rsi,[rsi]"
+	    "lea_rdx,[rsp+DWORD] %8"
+	    "mov_rdx,[rdx]"
+	    "mov_rax, %2"
+	    "syscall");
 }
 
 FILE* fopen(char* filename, char* mode)
@@ -96,10 +96,10 @@ FILE* fopen(char* filename, char* mode)
 
 int close(int fd)
 {
-	asm("LOAD_EFFECTIVE_ADDRESS_rdi %8"
-	    "LOAD_INTEGER_rdi"
-	    "LOAD_IMMEDIATE_rax %3"
-	    "SYSCALL");
+	asm("lea_rdi,[rsp+DWORD] %8"
+	    "mov_rdi,[rdi]"
+	    "mov_rax, %3"
+	    "syscall");
 }
 
 int fclose(FILE* stream)
@@ -110,12 +110,12 @@ int fclose(FILE* stream)
 
 int brk(void *addr)
 {
-	asm("LOAD_RSP_IMMEDIATE_into_rax %8"
-	    "PUSH_RAX"
-	    "LOAD_IMMEDIATE_rax %12"
-	    "POP_RBX"
-	    "COPY_rbx_to_rdi"
-	    "SYSCALL");
+	asm("mov_rax,[rsp+DWORD] %8"
+	    "push_rax"
+	    "mov_rax, %12"
+	    "pop_rbx"
+	    "mov_rdi,rbx"
+	    "syscall");
 }
 
 long _malloc_ptr;
@@ -172,8 +172,8 @@ void free(void* l)
 
 void exit(int value)
 {
-	asm("POP_RBX"
-	    "POP_RDI"
-	    "LOAD_IMMEDIATE_rax %0x3C"
-	    "SYSCALL");
+	asm("pop_rbx"
+	    "pop_rdi"
+	    "mov_rax, %0x3C"
+	    "syscall");
 }