print_int: investigate rsi clobbering

Author: h908714124

group3/group3.s

@@ -1,10 +1,7 @@
 	.equ READ, 0
-	.equ STDOUT, 1
 	.equ CLOSE, 3
-	.equ WRITE, 1
 	.equ OPEN, 2
 	.equ FSTAT, 5
-	.equ EXIT, 60
 	.equ MMAP, 9
 	.equ MUNMAP, 11
 	.equ OFFSET_SIZE, 48		# struct stat
@@ -76,7 +73,7 @@ stat_file:
 	mov	fh(%rip), %rdi
 	lea	st, %rsi
 	syscall
-	mov	48(%rsi), %rbx
+	mov	OFFSET_SIZE(%rsi), %rbx
 	mov	%rbx, file_size(%rip)
 	pop_all
 	return
@@ -113,9 +110,9 @@ copy_done:
 
 read_line:
 	enter
+	sub	$128, %rsp
 	push_all
 	mov	16(%rbp), %rax
-	sub	$128, %rsp
 	mov	$0, %rcx
 	cmp	%rcx, file_size(%rip)
 	je	read_line_done
@@ -161,28 +158,23 @@ munmap:
 
 print_lines:
 	enter
-	push_all
 	sub	$128, %rsp
+	push_all
 	mov	$0, %rbx
 
 print_lines_loop:
 
 	push	%rbx
-	call	print_int
-	pop	%rbx
-
-	push	%rbx
+	log	%rbx
 	call	read_line
 
 	add	%rax, %rbx
 
 
 	push	linebuf(%rip)
-	log	%rax
 	plop
 	plop
 
-	call	write_newline
 
 	inc	%rbx
 

print_int/main.s

@@ -3,21 +3,48 @@
 
 .include "print_int.s"
 
-basic_method:
-	enter
-	sub	$144, %rsp
-	push_all
-	mov	16(%rbp), %rsi
-	mov	$0, %rcx
-	pop_all
-	return
-
 main:
 	mov	$0x9084, %rax
 	shl	$16, %rax
 	add	$0xa412, %rax
-	push	%rax
-	call	print_int
+
+	mov	$1, %rbx
+	mov	$2, %rcx
+	mov	$3, %r8
+	mov	$4, %r9
+	mov	$5, %r10
+	mov	$6, %r11
+	mov	$7, %rdi
+	mov	$8, %rdx
+	mov	$255, %rsi
+
+	push	%rsi
+	log	%rsi
+
+	log	%rax
+	log	%rbx
+	log	%rcx
+	log	%r8
+	log	%r9
+	log	%r10
+	log	%r11
+	log	%rdi
+	log	%rdx
+	log	%rsi
+
+	log	%rax
+	log	%rbx
+	log	%rcx
+	log	%r8
+	log	%r9
+	log	%r10
+	log	%r11
+	log	%rdi
+	log	%rdx
+	log	%rsi
+
+	pop	%rsi
+	log	%rsi
 
 exit:
 	movq	$EXIT, %rax

print_int/print_int.s

@@ -15,7 +15,7 @@
 
 	.macro log ex
 	push	\ex
-	call	write_string
+	call	print_int
 	add	$8, %rsp
 	.endm
 
@@ -26,6 +26,7 @@
 	.endm
 
 	.macro push_all
+	push	%rsi
 	push	%rbx
 	push	%rcx
 	push	%r8
@@ -45,6 +46,7 @@
 	pop	%r8
 	pop	%rcx
 	pop	%rbx
+	pop	%rsi
 	.endm
 
 	.text
@@ -106,6 +108,7 @@ print_int:
 
 	sub	$48, %rsp
 	push_all
+	push	%rax
 
 	mov	$0, %rcx
 
@@ -145,9 +148,10 @@ print_int_pop_loop:
 	push	%rsi
 	push	%rdx
 	call	write_string
-	pop	%rdx
-	pop	%rsi
+	plop
+	plop
 
+	pop	%rax
 	pop_all
 	return