group3: print first line

Author: h908714124

group3/group3.s

@@ -9,31 +9,6 @@
 	.equ MUNMAP, 11
 	.equ OFFSET_SIZE, 48		# struct stat
 
-	.macro enter
-	push	%rbp
-	mov	%rsp, %rbp
-	push	%rcx
-	push	%r8
-	push	%r9
-	push	%r10
-	push	%r11
-	push	%rdi
-	push	%rdx
-	.endm
-
-	.macro return
-	pop	%rdx
-	pop	%rdi
-	pop	%r11
-	pop	%r10
-	pop	%r9
-	pop	%r8
-	pop	%rcx
-	mov	%rbp, %rsp
-	pop	%rbp
-	ret
-	.endm
-
 	.data
 
 fh:
@@ -57,7 +32,9 @@ file:
 	.text
 	.globl main
 
-mmap:
+.include "../print_int/print_int.s"
+
+get_memory:
 	enter
 	mov	$MMAP, %rax
 	mov	$0, %rdi		#addr
@@ -76,7 +53,7 @@ exit:
 	syscall
 	return
 
-open:
+open_file:
 	enter
 	mov	$OPEN, %rax
 	mov	$file, %rdi
@@ -86,7 +63,7 @@ open:
 	mov	%rax, fh(%rip)
 	return
 
-stat:
+stat_file:
 	enter
 	mov	$FSTAT, %rax
 	mov	fh(%rip), %rdi
@@ -96,7 +73,7 @@ stat:
 	mov	%rbx, file_size(%rip)
 	return
 
-read_file:
+init_file:
 	enter
 	mov	$READ, %rax
 	mov	fh(%rip), %rdi
@@ -161,15 +138,6 @@ copy_lines_loop:
 copy_lines_done:
 	return
 
-write:
-	enter
-	mov	24(%rbp), %rsi		# param: address
-	mov	16(%rbp), %rdx		# param: size
-	mov	$WRITE, %rax
-	mov	$STDOUT, %rdi
-	syscall
-	return
-
 close:
 	enter
 	mov	$CLOSE, %rax
@@ -191,20 +159,21 @@ munmap:
 
 main:
 	enter
-	call	open
-	call	stat
-	call	mmap
+	call	open_file
+	call	stat_file
+	call	get_memory
 	mov	%rax, in(%rip)
-	call	mmap
+	call	get_memory
 	mov	%rax, out(%rip)
-	call	mmap
+	call	get_memory
 	mov	%rax, line(%rip)
-	call	read_file
+	call	init_file
+	call	read_line
 	#call	copy
 
-	push	in(%rip)
-	push	file_size(%rip)
-	call	write
+	push	line(%rip)
+	push	%rax
+	call	write_string
 	pop	%rax
 	pop	%rax
 

print_int/Makefile

@@ -1,5 +1,5 @@
 build:
-	$(CC) print_int.s -c
+	$(CC) main.s -c -o print_int.o
 	$(LD) -e main -o print_int print_int.o
 
 run: build

print_int/main.s

@@ -0,0 +1,44 @@
+	.text
+	.globl main
+
+.include "../print_int/print_int.s"
+
+print_char:					# debugging
+	frame_enter
+	sys_enter
+	push	%rax
+	push	%rcx
+	push	%rdx
+	push	%rsi
+	push	%rdi
+	mov	16(%rbp), %rax
+	movb	$0x3e, -128(%rbp)
+	movb	%al, -127(%rbp)
+	movb	$0x3c, -126(%rbp)
+	movb	$0xa, -125(%rbp)
+	lea	-128(%rbp), %rsi
+	mov	$WRITE, %rax
+	mov	$STDOUT, %rdi
+	mov	$4, %rdx
+	syscall
+	pop	%rdi
+	pop	%rsi
+	pop	%rdx
+	pop	%rcx
+	pop	%rax
+	sys_leave
+	frame_leave
+	ret
+
+main:
+	mov	$0x9084, %rax
+	shl	$16, %rax
+	add	$0xa412, %rax
+	push	%rax
+	call	print_int
+	jmp	exit
+
+exit:
+	movq	$EXIT, %rax
+	movq	$0, %rdi
+	syscall

print_int/print_int.s

@@ -24,44 +24,42 @@
 	pop	%rbp
 	.endm
 
-	.text
-	.globl main
-
-print_char:					# debugging
-	frame_enter
-	sys_enter
-	push	%rax
+	.macro enter
+	push	%rbp
+	mov	%rsp, %rbp
 	push	%rcx
-	push	%rdx
-	push	%rsi
+	push	%r8
+	push	%r9
+	push	%r10
+	push	%r11
 	push	%rdi
-	mov	16(%rbp), %rax
-	movb	$0x3e, -128(%rbp)
-	movb	%al, -127(%rbp)
-	movb	$0x3c, -126(%rbp)
-	movb	$0xa, -125(%rbp)
-	lea	-128(%rbp), %rsi
-	mov	$WRITE, %rax
-	mov	$STDOUT, %rdi
-	mov	$4, %rdx
-	syscall
-	pop	%rdi
-	pop	%rsi
+	push	%rdx
+	.endm
+
+	.macro return
 	pop	%rdx
+	pop	%rdi
+	pop	%r11
+	pop	%r10
+	pop	%r9
+	pop	%r8
 	pop	%rcx
-	pop	%rax
-	sys_leave
-	frame_leave
+	mov	%rbp, %rsp
+	pop	%rbp
 	ret
+	.endm
+
+	.text
+	.globl main
 
-# char *rsi, int rdx
 write_string:
-	sys_enter
+	enter
+	mov	24(%rbp), %rsi		# param: address
+	mov	16(%rbp), %rdx		# param: size
 	mov	$WRITE, %rax
 	mov	$STDOUT, %rdi
 	syscall
-	sys_leave
-	ret
+	return
 
 print_int:
 	frame_enter
@@ -109,7 +107,11 @@ print_int_pop_loop:
 	inc	%rdx
 
 	lea	-96(%rbp), %rsi
+	push	%rsi
+	push	%rdx
 	call	write_string
+	pop	%rdx
+	pop	%rsi
 
 	pop	%rdi
 	pop	%rcx
@@ -120,16 +122,3 @@ print_int_pop_loop:
 	frame_leave
 
 	ret
-
-main:
-	mov	$0x9084, %rax
-	shl	$16, %rax
-	add	$0xa412, %rax
-	push	%rax
-	call	print_int
-	jmp	exit
-
-exit:
-	movq	$EXIT, %rax
-	movq	$0, %rdi
-	syscall