Bugfix OP & glitch runner

yaglitch.asm

@@ -266,6 +266,7 @@ parse:
 		stosq
 		xor rax, rax
 		xchg rax, rdx
+		shl rax, 32
 		stosq
 		pop rax
 		.match_op:
@@ -320,11 +321,12 @@ stack_init:
 	mov rcx, STACK_SZ
 	mov rdi, stack_buff
 	xor rax, rax
-	mov [tosp], rax
 	mov [t], eax
 	.loop_buff_init:
 		stosd
 		loop .loop_buff_init
+	mov al, 7 * 4
+	mov [tosp], al
 
 sdl_init:
 	mov rdi, 0x0000FFFF
@@ -562,29 +564,44 @@ run_glitch:
 		lodsq
 		mov rdi, rax
 		pop rax
+		push rsi
 		call rax
+		pop rsi
+		jmp .loop
 	.end_glitch:
 	xor rbx, rbx
 	mov bl, [tosp]
 	lea rdi, [stack_buff + rbx]
 	mov eax, [rdi]
-	push rax
-	mov rdi, rax
-	mov rsi, 1
-	call print_hnum
-	pop rax
+; DEBUG
+	;push rax
+	;xor rdi, rdi
+	;mov rdi, rax
+	;mov rsi, 1
+	;call print_hnum
+	;mov rax, " "
+	;push rax
+	;mov rax, 1
+	;mov rdi, 1
+	;mov rsi, rsp
+	;mov rdx, 1
+	;syscall
+	;pop rax
+	;pop rax
+; /DEBUG
 	ret
 
 OP:
 	.numeric:
 		; rdi contain the number
+		shr rdi, 32
 	._push:
 		; push rdi (edi) on stack_buff
 		mov eax, edi
 		xor rbx, rbx
 		mov bl, [tosp]
-		inc bl
-		cmp bl, 8
+		add bl, 4
+		cmp bl, 8 * 4
 		jl .go_push
 		mov bl, 0
 		.go_push:
@@ -598,21 +615,21 @@ OP:
 		; pop eax from stack_buff
 		xor rbx, rbx
 		mov bl, [tosp]
+		lea rsi, [stack_buff+rbx]
+		xor rax, rax
+		lodsd
 		test bl, bl
 		jz .pop_no_dec
-		dec bl
-		jmp .go_pop
+		sub bl, 4
+		jmp .pop_end
 		.pop_no_dec:
-			mov bl, 7
-		.go_pop:
+			mov bl, 7 * 4
+		.pop_end:
 			mov [tosp], bl
-			lea rsi, [stack_buff+rbx]
-			lodsd
 		ret
 
 
 	.t: ; push t on the stack
-		xor rdi, rdi
 		mov edi, [t]
 		call ._push
 		ret
@@ -636,50 +653,40 @@ OP:
 		popf
 		ret
 	.mul:
-		call OP._pop
-		mov ebx, eax
-		call OP._pop
+		call .prep_2arg
 		mul ebx
 		mov edi, eax
 		call OP._push
 		ret
 	.div:
-		call OP._pop
-		mov ebx, eax
-		call OP._pop
+		call .prep_2arg
 		div ebx
 		mov edi, eax
 		call OP._push
 		ret
 	.add:
-		call OP._pop
-		mov ebx, eax
-		call OP._pop
+		call .prep_2arg
 		add eax, ebx
 		mov edi, eax
 		call OP._push
 		ret
 	.sub:
-		call OP._pop
-		mov ebx, eax
-		call OP._pop
+		call .prep_2arg
 		sub eax, ebx
 		mov edi, eax
 		call OP._push
 		ret
 	.mod:
-		call OP._pop
-		mov ebx, eax
-		call OP._pop
+		call .prep_2arg
 		div ebx
 		mov edi, edx
 		call OP._push
 		ret
 	.lshift:
-		xor rcx, rcx
 		call OP._pop
-		mov ecx, eax
+		push rax
 		call OP._pop
+		pop rcx
 		.lshift_loop:
 			shl eax, 1
 			loop .lshift_loop
@@ -687,10 +694,10 @@ OP:
 		call OP._push
 		ret
 	.rshift:
-		xor rcx, rcx
 		call OP._pop
-		mov ecx, eax
+		push rax
 		call OP._pop
+		pop rcx
 		.rshift_loop:
 			shr eax, 1
 			loop .rshift_loop
@@ -698,25 +705,19 @@ OP:
 		call OP._push
 		ret
 	.and:
-		call OP._pop
-		mov ebx, eax
-		call OP._pop
+		call .prep_2arg
 		and eax, ebx
 		mov edi, eax
 		call OP._push
 		ret
 	.or:
-		call OP._pop
-		mov ebx, eax
-		call OP._pop
+		call .prep_2arg
 		or eax, ebx
 		mov edi, eax
 		call OP._push
 		ret
 	.xor:
-		call OP._pop
-		mov ebx, eax
-		call OP._pop
+		call .prep_2arg
 		xor eax, ebx
 		mov edi, eax
 		call OP._push
@@ -760,9 +761,7 @@ OP:
 		call OP._push
 		ret
 	.lt:
-		call OP._pop
-		mov ebx, eax
-		call OP._pop
+		call .prep_2arg
 		xor rdi, rdi
 		cmp eax, ebx
 		jge .lt_false
@@ -771,9 +770,7 @@ OP:
 		call OP._push
 		ret
 	.gt:
-		call OP._pop
-		mov ebx, eax
-		call OP._pop
+		call .prep_2arg
 		xor rdi, rdi
 		cmp eax, ebx
 		jle .gt_false
@@ -782,9 +779,7 @@ OP:
 		call OP._push
 		ret
 	.eq:
-		call OP._pop
-		mov ebx, eax
-		call OP._pop
+		call .prep_2arg
 		xor rdi, rdi
 		cmp eax, ebx
 		jne .eq_false
@@ -793,3 +788,10 @@ OP:
 		call OP._push
 		ret
 
+	.prep_2arg:
+		; utils that pop both arguments V1 in eax, V2 in ebx
+		call OP._pop
+		push rax
+		call OP._pop
+		pop rbx
+		ret