wip: chasing a bug where print_int clobbers registers

Author: h908714124

group3/.gdbinit

@@ -3,4 +3,4 @@ lay asm
 define hook-quit
 	set confirm off
 end
-break copy
+break print_lines_loop

group3/group3.s

@@ -17,7 +17,7 @@ in:
 	.quad	0
 out:
 	.quad	0
-line:
+linebuf:
 	.quad	0
 file_size:
 	.quad	0
@@ -101,14 +101,16 @@ copy_done:
 
 read_line:
 	enter
+	mov	16(%rbp), %rax
 	sub	$128, %rsp
 	mov	$0, %rcx
 	cmp	%rcx, file_size(%rip)
 	je	read_line_done
 	mov	in(%rip), %rbx
+	add	%rax, %rbx
 read_line_loop:
 	mov	%rcx, %rdi
-	add	line(%rip), %rdi
+	add	linebuf(%rip), %rdi
 	mov	(%rbx, %rcx), %rsi
 	movb	%sil, (%rdi)
 	cmp	$0xa, %sil
@@ -120,24 +122,6 @@ read_line_done:
 	mov	%rcx, %rax
 	return
 
-copy_lines:
-	enter
-	sub	$128, %rsp
-	mov	$0, %rcx
-	cmp	%rcx, file_size(%rip)
-	je	copy_lines_done
-	mov	in(%rip), %rbx
-copy_lines_loop:
-	mov	%rcx, %rdi
-	add	out(%rip), %rdi
-	mov	(%rbx, %rcx), %rsi
-	movb	%sil, (%rdi)
-	inc	%rcx
-	cmp	%rcx, file_size(%rip)
-	jne	copy_lines_loop
-copy_lines_done:
-	return
-
 close:
 	enter
 	mov	$CLOSE, %rax
@@ -157,6 +141,42 @@ munmap:
 	syscall
 	return
 
+print_lines:
+	enter
+	sub	$128, %rsp
+	mov	$0, %rbx
+
+print_lines_loop:
+
+	push	%rbx
+	call	print_int
+	pop	%rbx
+
+	push	%rbx
+	call	read_line
+
+	add	%rax, %rbx
+
+
+	push	linebuf(%rip)
+	push	%rax
+	call	write_string
+	pop	%rax
+	pop	%rax
+	pop	%rax
+
+	call	write_newline
+
+	inc	%rbx
+
+	cmp	$30, %rbx
+
+	jl	print_lines_loop
+print_lines_done:
+	push	$0x31
+	call	write_char_debug
+	return
+
 main:
 	enter
 	call	open_file
@@ -166,17 +186,14 @@ main:
 	call	get_memory
 	mov	%rax, out(%rip)
 	call	get_memory
-	mov	%rax, line(%rip)
+	mov	%rax, linebuf(%rip)
 	call	init_file
-	call	read_line
-	#call	copy
-
-	push	line(%rip)
-	push	%rax
-	call	write_string
-	call	write_newline
-	pop	%rax
-	pop	%rax
+	call	print_lines
+	#push	$0xc
+	#call	read_line
+	#push	linebuf(%rip)
+	#push	%rax
+	#call	write_string
 
 	call	close
 	call	munmap

print_int/main.s

@@ -1,13 +1,22 @@
 	.text
 	.globl main
 
-.include "../print_int/print_int.s"
+.include "print_int.s"
+
+basic_method:
+	enter
+	mov	$6, %rcx
+	return
 
 main:
 	mov	$0x9084, %rax
 	shl	$16, %rax
 	add	$0xa412, %rax
+	mov	$5, %rcx
 	push	%rax
+	call	#print_int
+	call	basic_method
+	push	%rcx
 	call	print_int
 	jmp	exit
 

print_int/print_int.s

@@ -4,29 +4,10 @@
 	.equ	WRITE, 1
 	.equ	EXIT, 60
 
-	.macro sys_enter
-	push	%rcx
-	push	%r11
-	.endm
-
-	.macro sys_leave
-	pop	%r11
-	pop	%rcx
-	.endm
-
-	.macro frame_enter
-	push	%rbp
-	mov	%rsp, %rbp
-	.endm
-
-	.macro frame_leave
-	mov	%rbp, %rsp
-	pop	%rbp
-	.endm
-
 	.macro enter
 	push	%rbp
 	mov	%rsp, %rbp
+	push	%rbx
 	push	%rcx
 	push	%r8
 	push	%r9
@@ -44,6 +25,7 @@
 	pop	%r9
 	pop	%r8
 	pop	%rcx
+	pop	%rbx
 	mov	%rbp, %rsp
 	pop	%rbp
 	ret
@@ -53,13 +35,7 @@
 	.globl main
 
 write_char_debug:
-	frame_enter
-	sys_enter
-	push	%rax
-	push	%rcx
-	push	%rdx
-	push	%rsi
-	push	%rdi
+	enter
 	mov	16(%rbp), %rax
 	movb	$0x3e, -128(%rbp)
 	movb	%al, -127(%rbp)
@@ -70,42 +46,25 @@ write_char_debug:
 	mov	$STDOUT, %rdi
 	mov	$4, %rdx
 	syscall
-	pop	%rdi
-	pop	%rsi
-	pop	%rdx
-	pop	%rcx
-	pop	%rax
-	sys_leave
-	frame_leave
-	ret
+	return
 
 write_char:
 	enter
-	push	%rax
-	push	%rcx
-	push	%rdx
-	push	%rsi
-	push	%rdi
 	mov	16(%rbp), %rax
 	movb	%al, -64(%rbp)
 	lea	-64(%rbp), %rsi
 	mov	$WRITE, %rax
 	mov	$STDOUT, %rdi
 	mov	$1, %rdx
 	syscall
-	pop	%rdi
-	pop	%rsi
-	pop	%rdx
-	pop	%rcx
-	pop	%rax
 	return
 
 write_newline:
-	mov	%rsp, %rbp
+	enter
 	push	$0xa
 	call	write_char
-	mov	%rbp, %rsp
-	ret
+	pop	%rax
+	return
 
 write_string:
 	enter
@@ -117,15 +76,9 @@ write_string:
 	return
 
 print_int:
-	frame_enter
+	enter
 	sub	$128, %rsp
 
-	push	%rax
-	push	%rsi
-	push	%rdx
-	push	%rcx
-	push	%rdi
-
 	mov	16(%rbp), %rsi
 	mov	$0, %rcx
 
@@ -168,12 +121,5 @@ print_int_pop_loop:
 	pop	%rdx
 	pop	%rsi
 
-	pop	%rdi
-	pop	%rcx
-	pop	%rdx
-	pop	%rsi
-	pop	%rax
-
-	frame_leave
+	return
 
-	ret