Split yaglitch.asm

Makefile

@@ -23,13 +23,14 @@ endif
 
 OBJ=$(TARGET).o
 SRC=$(TARGET).asm
+DEPS=sdl.asm yaglitch_op.asm yaglitch_ui.asm
 
 all: $(TARGET)
 
 $(TARGET): $(OBJ)
 	ld $(LDFLAGS) $< -o $@
 
-$(OBJ): $(SRC) sdl.asm Makefile
+$(OBJ): $(SRC) $(DEPS) Makefile
 	$(NASM) $(ASFLAGS) $<
 
 .PHONY: clean

yaglitch.asm

@@ -423,66 +423,7 @@ sdl_init:
 	pop rcx
 	pop rcx
 	; RAZ surface & blit
-	push rax ; push surface addr
-	mov rdi, rax
-	call SDL_LockSurface
-
-	%ifdef SDL2
-		xor rdx, rdx
-		xor rcx, rcx
-		MOV_surf_w ecx, visu_surf
-		xor rax, rax
-		MOV_surf_pitch eax, visu_surf
-		mul ecx
-		MOV_surf_pixels rdi, visu_surf
-		xor rsi, rsi
-		;mov rsi, 0xFF ;white
-		mov rdx, rax
-		call SDL_memset ; seems to malloc the pixels
-	%endif
-
-	%ifdef SDL1
-		xor rcx, rcx
-		MOV_surf_w ecx, visu_surf
-		push rcx
-		MOV_surf_h ecx, visu_surf
-		MOV_surf_pixels rdi, visu_surf
-		;mov rax, 0xffcc22ff ; magenta
-		;mov rax, 0xffffffff ; white
-		dec rcx
-		.loop_razh:
-			push rcx
-			mov rcx, [rsp+8]
-			dec rcx
-			.loop_razw:
-				stosd
-				loop .loop_razw
-			pop rcx
-			loop .loop_razh
-		pop rcx
-	%endif
-
-	pop rdi ; surface addr
-	call SDL_UnlockSurface
-
-	mov rdi, [visu_surf]
-	xor rsi, rsi
-	mov rdx, [visu_scr]
-	xor rcx, rcx
-	call SDL_BlitSurface
-	test rax, rax
-	jnz sdl_error
-
-	%ifdef SDL2
-		mov rdi, [visu_win]
-		call SDL_UpdateWindowSurface
-	%endif
-	%ifdef SDL1
-		mov rdi, [visu_scr]
-		call SDL_Flip
-	%endif
-
-
+	call clear_screen
 
 	%ifdef MIX_AUDIO
 		; init callback heap infos
@@ -886,228 +827,7 @@ run_glitch:
 ; /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 ebx, [tosp]
-		add ebx, 4
-		cmp ebx, STACK_SZ * 4
-		jl .go_push
-		mov ebx, 0
-		.go_push:
-			mov [tosp], ebx
-			lea rdi, [stack_buff+rbx]
-			stosd
-		ret
-
-	.drop: ; drop just calls pop
-	._pop:
-		; pop eax from stack_buff
-		xor rbx, rbx
-		mov ebx, [tosp]
-		lea rsi, [stack_buff+rbx]
-		xor rax, rax
-		lodsd
-		test ebx, ebx
-		jz .pop_no_dec
-		sub ebx, 4
-		jmp .pop_end
-		.pop_no_dec:
-			mov ebx, (STACK_SZ-1) * 4
-		.pop_end:
-			mov [tosp], ebx
-		ret
-
-
-	.t: ; push t on the stack
-		mov edi, [t]
-		call ._push
-		ret
-
-	.put:
-		pushf
-		cld
-		xor rbx, rbx
-		xor rax, rax
-		mov ebx, [tosp]
-		lea rsi, [stack_buff+rbx]
-		lodsd
-		and eax, 0xFF
-		inc eax
-		mov edx, eax
-		lodsd
-		neg rdx
-		lea rdi, [stack_buff + rdx]
-		stosq
-		call OP._pop
-		popf
-		ret
-	.mul:
-		call .prep_2arg
-		mul ebx
-		mov edi, eax
-		call OP._push
-		ret
-	.div:
-		call .prep_2arg
-		test ebx, ebx
-		jz .nodiv
-		xor rdx, rdx
-		div ebx
-		jmp .divend
-		.nodiv:
-		xor eax, eax
-		.divend:
-		mov edi, eax
-		call OP._push
-		ret
-	.add:
-		call .prep_2arg
-		add eax, ebx
-		mov edi, eax
-		call OP._push
-		ret
-	.sub:
-		call .prep_2arg
-		sub eax, ebx
-		mov edi, eax
-		call OP._push
-		ret
-	.mod:
-		call .prep_2arg
-		test rbx, rbx
-		jz .nomod
-		xor edx, edx
-		div ebx
-		jmp .endmod
-		.nomod:
-		xor edx, edx
-		.endmod:
-		mov edi, edx
-		call OP._push
-		ret
-	.lshift:
-		call OP._pop
-		push rax
-		call OP._pop
-		pop rcx
-		shl eax, cl
-		mov edi, eax
-		call OP._push
-		ret
-	.rshift:
-		call OP._pop
-		push rax
-		call OP._pop
-		pop rcx
-		shr eax, cl
-		mov edi, eax
-		call OP._push
-		ret
-	.and:
-		call .prep_2arg
-		and eax, ebx
-		mov edi, eax
-		call OP._push
-		ret
-	.or:
-		call .prep_2arg
-		or eax, ebx
-		mov edi, eax
-		call OP._push
-		ret
-	.xor:
-		call .prep_2arg
-		xor eax, ebx
-		mov edi, eax
-		call OP._push
-		ret
-	.not:
-		call OP._pop
-		not eax
-		mov edi, eax
-		call OP._push
-		ret
-	.dup:
-		call OP._pop
-		push rax
-		mov edi, eax
-		call OP._push
-		pop rdi
-		call OP._push
-		ret
-	.pick:
-		call OP._pop
-		inc eax
-		and eax, 0xFF
-		mov ebx, 4
-		mov ecx, [tosp]
-		mul ebx ; mul by data size
-		cmp eax, [tosp]
-		jg .pick_loop
-		sub ecx, eax
-		jmp .pick_lea
-		.pick_loop: ; eax > tosp
-		sub eax, ecx
-		mov ecx, (STACK_SZ - 1) * 4
-		sub ecx, eax
-		.pick_lea:
-		lea rsi, [stack_buff+ecx]
-		lodsd
-		push rax
-		call OP._pop
-		pop rdi
-		call OP._push
-		ret
-
+%include "yaglitch_op.asm"
 
-	.swap:
-		call OP._pop
-		push rax
-		call OP._pop
-		xchg rax, [rsp]
-		mov edi, eax
-		call OP._push
-		pop rdi
-		call OP._push
-		ret
-	.lt:
-		call .prep_2arg
-		xor rdi, rdi
-		cmp eax, ebx
-		jge .lt_false
-		not rdi
-		.lt_false:
-		call OP._push
-		ret
-	.gt:
-		call .prep_2arg
-		xor rdi, rdi
-		cmp eax, ebx
-		jle .gt_false
-		not rdi
-		.gt_false:
-		call OP._push
-		ret
-	.eq:
-		call .prep_2arg
-		xor rdi, rdi
-		cmp eax, ebx
-		jne .eq_false
-		not rdi
-		.eq_false:
-		call OP._push
-		ret
+%include "yaglitch_ui.asm"
 
-	.prep_2arg:
-		; utils that pop both arguments V1 in eax, V2 in ebx
-		call OP._pop
-		push rax
-		call OP._pop
-		pop rbx
-		ret

yaglitch_op.asm

@@ -0,0 +1,225 @@
+OP:
+	.numeric:
+		; rdi contain the number
+		shr rdi, 32
+	._push:
+		; push rdi (edi) on stack_buff
+		mov eax, edi
+		xor rbx, rbx
+		mov ebx, [tosp]
+		add ebx, 4
+		cmp ebx, STACK_SZ * 4
+		jl .go_push
+		mov ebx, 0
+		.go_push:
+			mov [tosp], ebx
+			lea rdi, [stack_buff+rbx]
+			stosd
+		ret
+
+	.drop: ; drop just calls pop
+	._pop:
+		; pop eax from stack_buff
+		xor rbx, rbx
+		mov ebx, [tosp]
+		lea rsi, [stack_buff+rbx]
+		xor rax, rax
+		lodsd
+		test ebx, ebx
+		jz .pop_no_dec
+		sub ebx, 4
+		jmp .pop_end
+		.pop_no_dec:
+			mov ebx, (STACK_SZ-1) * 4
+		.pop_end:
+			mov [tosp], ebx
+		ret
+
+
+	.t: ; push t on the stack
+		mov edi, [t]
+		call ._push
+		ret
+
+	.put:
+		pushf
+		cld
+		xor rbx, rbx
+		xor rax, rax
+		mov ebx, [tosp]
+		lea rsi, [stack_buff+rbx]
+		lodsd
+		and eax, 0xFF
+		inc eax
+		mov edx, eax
+		lodsd
+		neg rdx
+		lea rdi, [stack_buff + rdx]
+		stosq
+		call OP._pop
+		popf
+		ret
+	.mul:
+		call .prep_2arg
+		mul ebx
+		mov edi, eax
+		call OP._push
+		ret
+	.div:
+		call .prep_2arg
+		test ebx, ebx
+		jz .nodiv
+		xor rdx, rdx
+		div ebx
+		jmp .divend
+		.nodiv:
+		xor eax, eax
+		.divend:
+		mov edi, eax
+		call OP._push
+		ret
+	.add:
+		call .prep_2arg
+		add eax, ebx
+		mov edi, eax
+		call OP._push
+		ret
+	.sub:
+		call .prep_2arg
+		sub eax, ebx
+		mov edi, eax
+		call OP._push
+		ret
+	.mod:
+		call .prep_2arg
+		test rbx, rbx
+		jz .nomod
+		xor edx, edx
+		div ebx
+		jmp .endmod
+		.nomod:
+		xor edx, edx
+		.endmod:
+		mov edi, edx
+		call OP._push
+		ret
+	.lshift:
+		call OP._pop
+		push rax
+		call OP._pop
+		pop rcx
+		shl eax, cl
+		mov edi, eax
+		call OP._push
+		ret
+	.rshift:
+		call OP._pop
+		push rax
+		call OP._pop
+		pop rcx
+		shr eax, cl
+		mov edi, eax
+		call OP._push
+		ret
+	.and:
+		call .prep_2arg
+		and eax, ebx
+		mov edi, eax
+		call OP._push
+		ret
+	.or:
+		call .prep_2arg
+		or eax, ebx
+		mov edi, eax
+		call OP._push
+		ret
+	.xor:
+		call .prep_2arg
+		xor eax, ebx
+		mov edi, eax
+		call OP._push
+		ret
+	.not:
+		call OP._pop
+		not eax
+		mov edi, eax
+		call OP._push
+		ret
+	.dup:
+		call OP._pop
+		push rax
+		mov edi, eax
+		call OP._push
+		pop rdi
+		call OP._push
+		ret
+	.pick:
+		call OP._pop
+		inc eax
+		and eax, 0xFF
+		mov ebx, 4
+		mov ecx, [tosp]
+		mul ebx ; mul by data size
+		cmp eax, [tosp]
+		jg .pick_loop
+		sub ecx, eax
+		jmp .pick_lea
+		.pick_loop: ; eax > tosp
+		sub eax, ecx
+		mov ecx, (STACK_SZ - 1) * 4
+		sub ecx, eax
+		.pick_lea:
+		lea rsi, [stack_buff+ecx]
+		lodsd
+		push rax
+		call OP._pop
+		pop rdi
+		call OP._push
+		ret
+
+
+	.swap:
+		call OP._pop
+		push rax
+		call OP._pop
+		xchg rax, [rsp]
+		mov edi, eax
+		call OP._push
+		pop rdi
+		call OP._push
+		ret
+	.lt:
+		call .prep_2arg
+		xor rdi, rdi
+		cmp eax, ebx
+		jge .lt_false
+		not rdi
+		.lt_false:
+		call OP._push
+		ret
+	.gt:
+		call .prep_2arg
+		xor rdi, rdi
+		cmp eax, ebx
+		jle .gt_false
+		not rdi
+		.gt_false:
+		call OP._push
+		ret
+	.eq:
+		call .prep_2arg
+		xor rdi, rdi
+		cmp eax, ebx
+		jne .eq_false
+		not rdi
+		.eq_false:
+		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

yaglitch_ui.asm

@@ -0,0 +1,62 @@
+clear_screen:
+	mov rdi, [visu_surf]
+	push rdi
+	call SDL_LockSurface
+
+	%ifdef SDL2
+		xor rdx, rdx
+		xor rcx, rcx
+		MOV_surf_w ecx, visu_surf
+		xor rax, rax
+		MOV_surf_pitch eax, visu_surf
+		mul ecx
+		MOV_surf_pixels rdi, visu_surf
+		xor rsi, rsi
+		;mov rsi, 0xFF ;white
+		mov rdx, rax
+		call SDL_memset ; seems to malloc the pixels
+	%endif
+
+	%ifdef SDL1
+		xor rcx, rcx
+		MOV_surf_w ecx, visu_surf
+		push rcx
+		MOV_surf_h ecx, visu_surf
+		MOV_surf_pixels rdi, visu_surf
+		;mov rax, 0xffcc22ff ; magenta
+		;mov rax, 0xffffffff ; white
+		dec rcx
+		.loop_razh:
+			push rcx
+			mov rcx, [rsp+8]
+			dec rcx
+			.loop_razw:
+				stosd
+				loop .loop_razw
+			pop rcx
+			loop .loop_razh
+		pop rcx
+	%endif
+
+	pop rdi ; surface addr
+	call SDL_UnlockSurface
+
+	mov rdi, [visu_surf]
+	xor rsi, rsi
+	mov rdx, [visu_scr]
+	xor rcx, rcx
+	call SDL_BlitSurface
+	test rax, rax
+	jnz sdl_error
+
+	%ifdef SDL2
+		mov rdi, [visu_win]
+		call SDL_UpdateWindowSurface
+	%endif
+	%ifdef SDL1
+		mov rdi, [visu_scr]
+		call SDL_Flip
+	%endif
+	
+	ret
+