Old version without ELF support

bfc.asm

@@ -36,10 +36,6 @@ ALIGNMODE k8
 
 section .data
 
-	bf_start_head:
-		push 0x00400085
-		;dw 0x6885004000
-	bf_start_head_sz: equ $ - bf_start_head
 	bf_start:
 		jmp .start
 		.mremap: ; rbx is resize size
@@ -187,7 +183,6 @@ section .data
 
 	bf_loopstart:
 		mov rbx, strict qword 0x1
-		add rbx, [rsp]
 		xor rdx, rdx
 		mov dl, [rsi]
 		cmp dl, 0
@@ -198,7 +193,6 @@ section .data
 
 	bf_loopend:
 		mov rbx, strict qword 0x1
-		add rbx, [rsp]
 		xor rdx, rdx
 		mov dl, [rsi]
 		cmp dl, 0
@@ -213,184 +207,41 @@ section .data
 		syscall
 	bf_exit_sz: equ $ - bf_exit
 
-	elf_head: dw 0x457f, 0x464c, 0x0102, 0x0001,
-	times 4 dw 0x0
-	; 0x10
-	dw 0x0002, 0x003e, 0x0001, 0x0000
-	dw 0x080, 0x040, 0x0, 0x0
-	; 0x20
-	dw 0x0040
-	times 3 dw 0x0 
-	elf_section_head_offset : times 8 db  0xFF ; 0x28
-	; 0x30
-	dw 0x0, 0x0, 0x40, 0x38, 0x1, 0x40, 0x3, 0x2
-	; 0x40 section header
-	dw 0x1, 0x0, 0x5 ; load in memory with RX perm
-	times 5 dw 0x0
-	; 0x50
-	dw 0x0, 0x40, 0, 0, 0, 0x40, 0, 0 ; load at 0x40000
-	; 0x60
-	elf_prog_sz: times 16 db 0xFF ; 0x60 & 0x 68
-	; 0x70
-	dw 0x0, 0x20
-	times 6 dw 0x0
-	elf_head_sz: equ $ - elf_head
-
-	elf_shstrtab: db ".shstrtab", 0x0, ".text", 0x0
-	align 8
-	elf_shstrtab_sz: equ $ - elf_shstrtab
-
-	elf_section_headers: times 8 dq 0x0 ; head0
-	; head 1
-	dw 0xb, 0, 0x1, 0, 0x6, 0, 0, 0
-	dw 0x80, 0x40, 0, 0, 0x80, 0, 0, 0
-	elf_section_text_sz: times 8 db 0xFF
-	dq 0x0
-	dw 0x10
-	times 7 dw 0x0
-	; head2
-	dw 0x1, 0, 0x3 , 0, 0, 0, 0, 0
-	dq 0x0
-	elf_section_strtab_off: times 8 db 0xFF
-	dw 0x11
-	times 7 dw 0x0
-	dw 0x1
-	times 7 dw 0x0
-	elf_section_headers_sz: equ $ - elf_section_headers
-
-	default_output: db "a.out", 0x0
-
 	miss_open: db "Missing opening '[' matching closing ']'"
 	miss_open_sz: equ $ - miss_open
-	chr_list : db ": ", 0xA, 0x0
+	chr_list : db ": ", 0xA
 	read_error: db "Error reading file "
 	read_error_sz: equ $ - read_error
-	usage_err: db "Usage : [-e [-o a.out]] FILE.BF"
+	usage_err: db "Usage : FILE.BF"
 	usage_err_sz: equ $ - usage_err
 	open_err: db "Error opening file", 0xa
 	open_err_sz: equ $ - open_err
 
+section .bss
+	read_buff: resb 128
+
 section .text
 global _start
 _start:
-; using heap to store arguments
-%define bf_source [r13]
-%define elf_file [r13+0x8]
-%define elf_out [r13+0x11]
-%define heap_size 0x12
-	
-	mov rax, 0xc
-	xor rdi, rdi
-	syscall
-	mov rdi, rax
-	mov r13, rax ; heap start
-	add rdi, heap_size
-	mov rax, 0xc
-	syscall
-
-	;argument parsing
 	mov rcx, [rsp] ; argc
 	cmp rcx, 2
-	jl .badarg
-	je .init_1arg
-	cmp rcx, 5
-	jg .badarg
-
-	mov rsi, rsp
-	add rsi, 8 ; argv[0]
-	dec rcx
-	.argloop:
-		add rsi, 8
-		mov rdi, [rsi]
-		mov al, [rdi]
-		cmp al, 0x2d ; '-'
-		jne .filearg
-		mov al, [rdi+2]
-		test al, al
-		jnz .filearg
-		; arg is '-X' testing X
-		mov al, [rdi+1]
-		cmp al, 0x68 ; '-h'
-		je .badarg
-		cmp al, 0x65 ; '-e'
-		je .elfout_arg
-		cmp al, 0x6f ; '-o'
-		jne .badarg
-
-		; -o storing file
-		test rcx, rcx
-		jz .badarg ; no more args
-		dec rcx
-		add rsi, 8
-		mov rdi, [rsi]
-		mov elf_file, rdi
-		loop .argloop
-		jmp .init
-
-		.elfout_arg:
-			mov al, 0x1
-			mov elf_out, al
-			mov rax, elf_file
-			test rax, rax
-			jz .default_out
-			.elfout_arg_end:
-			loop .argloop
-			jmp .init
-			.default_out:
-				mov rax, default_output
-				mov elf_file, rax
-				jmp .elfout_arg_end
-
-		.filearg:
-			mov rax, bf_source
-			cmp rax, 0
-			.br3:
-			jnz .badarg ; file allready given
-			mov bf_source, rdi
-			loop .argloop
-			jmp .init
-
-	.init_1arg:
-		mov rax, [rsp+16]
-		mov bf_source, rax
-	.init:
-	; code map init
+	jne .badarg
+
+	; JIT code map init
 	; rsi map size
 	mov rsi, 0x10
 	call initmap
 
 	mov rax, 0x2 ; open
-	mov rdi, bf_source ; from heap
-	test rdi, rdi
-	jz .badarg
-	xor rsi, rsi ; O_RDONLY
-	xor rdx, rdx ; no mode
+	mov rdi, [rsp+16] ; argv[1]
+	xor rsi, rsi ; no flags
+	xor rdx, rdx ; O_RDONLY
 	syscall
 	cmp rax, 0
 	jl .err_open
-	push rax ; fd
-	push r13 ; heap
 
 	call compile_bf
 
-	pop r13 ; heap
-	pop rdi ; fd
-	sub rax, r15
-	push rax ; map len
-
-	mov rax, 0x3 ; close
-	syscall
-
-	mov al, elf_out
-	test al, al
-	jnz .write_elf
-
-	
-	.code_jmp:
-	; restore heap
-	mov rax, 0xc
-	mov rdi, r13
-	syscall
 	; set code map perm
 	mov rax, 0xA ; mprotect
 	mov rdi, r15
@@ -399,91 +250,7 @@ _start:
 	syscall
 
 	push r15
-	jmp r15 ; end... jumping in bf code map
-
-	.write_elf: ; writing elf file
-	mov rax, [rsp] ; map len
-	add rax, bf_start_head_sz
-	mov [elf_section_text_sz], rax
-	add rax, elf_head_sz ; elf head + map_ptr
-	mov [elf_head + 0x60], rax
-	mov [elf_head + 0x68], rax
-	mov [elf_section_strtab_off], rax
-	add rax, elf_shstrtab_sz ; section head offset
-	xor r14, r14 ; store align padding for section header
-	xor rbx, rbx
-	mov bl, al
-	and bl, 0x0F
-	test bl, bl
-	jz .aligned_section
-	mov r14, 0x10
-	sub r14, rbx
-	and al, 0xF0
-	add rax, 0x10
-	.aligned_section:
-	mov [elf_head + 0x28], rax
-
-	mov rax, 0x2
-	mov rdi, elf_file
-	mov rsi, 0x40 | 0x200 | 0x1 ; O_CREAT | O_TRUNC | O_WRONLY
-	mov rdx, 755o ; perm
-	syscall
-	cmp rax, 0
-	jl .err_open
-
-	push rax ; fd
-
-	mov rax, 1
-	mov rdi, [rsp]
-	mov rsi, elf_head
-	mov rdx, elf_head_sz
-	syscall
-
-	mov rax, 1
-	mov rdi, [rsp]
-	mov rsi, bf_start_head
-	mov rdx, bf_start_head_sz
-	syscall
-
-	mov rax, 1
-	mov rdi, [rsp]
-	mov rsi, r15 ; map_addr
-	mov rdx, [rsp+8] ; map len
-	syscall
-
-	mov rax, 1
-	mov rdi, [rsp]
-	mov rsi, elf_shstrtab
-	mov rdx, elf_shstrtab_sz
-	syscall
-
-	.padloop:
-		test r14, r14
-		jz .end_padloop
-		mov rax, 1
-		mov rdi, [rsp]
-		mov rsi, elf_section_headers ; 0x0
-		mov rdx, 1
-		syscall
-		dec r14
-		jmp .padloop
-	.end_padloop:
-
-	mov rax, 1
-	mov rdi, [rsp]
-	mov rsi, elf_section_headers
-	mov rdx, elf_section_headers_sz
-	syscall
-
-	pop rdi ; fd
-	mov rax, 0x3 ; close
-	syscall
-	pop rax ; map_len
-
-	mov rax, 0x3c ; exit
-	xor rdi, rdi
-	syscall
-
+	jmp r15
 
 	.err_open:
 		mov rax, 1 ; write
@@ -528,9 +295,6 @@ _start:
 		mov rax, 0x3c ; exit
 		mov rdi, 1
 		syscall
-%undef heap_size
-%undef elf_file
-%undef bf_source
 
 ; Init a writable memory map
 ; len in rsi
@@ -585,9 +349,7 @@ mremap:
 ;	r14 map size
 ;	r15 map addr
 ; ret :
-;	rax map ptr
-;	r15 map addr
-;	r14 map size
+;	rax map addr
 compile_bf:
 	; Allocating growing heap to store various datas
 	; heap start will be stored in r13
@@ -753,10 +515,7 @@ compile_bf:
 			push rdx
 			jmp .callcpy
 		.loopstart:
-			mov rbx, map_ptr
-			sub rbx, r15
-			push rbx ; loop offset from map start
-			;push qword map_ptr ; ret addr
+			push qword map_ptr ; ret addr
 			mov rsi, bf_loopstart
 			mov rdx, bf_loopstart_sz
 			push rdx
@@ -768,15 +527,13 @@ compile_bf:
 			mov rdx, bf_loopend_sz
 			push rdx
 			call code_cpy
-			mov map_ptr, rax ; rax is map_ptr
+			mov map_ptr, rax
 			pop rdx
 			sub rax, rdx
 			add rax, 2 ;arg addr in code map
-			pop rbx ; loop_start code offset
+			pop rbx ; loop_start code addr
 			mov [rax], rbx ; loop end jump to start
 			mov rax, map_ptr
-			sub rax, r15 ; loop end offset in map
-			add rbx, r15 ; loop start addr
 			mov [rbx+2], rax ; start jump to end
 			jmp .nxtinstr
 
@@ -850,18 +607,15 @@ compile_bf:
 	mov rsi, bf_exit
 	mov rdx, bf_exit_sz
 	call code_cpy
-	mov map_ptr, rax
 
 	; restoring stack
 	mov rsp, base_rsp
-	push qword map_ptr
 
 	; restore heap
 	mov rax, 0xc ; brk
 	mov rdi, r13
 	syscall
 
-	pop rax ; return map_ptr
 	ret
 
 %undef fd