use printf

Author: h908714124

draft/draft.c

@@ -7,69 +7,14 @@
 #include <sys/syscall.h>
 #include <sys/types.h>
 
-char* in;
-char* out;
-
-int get_zero() {
-	int result = 128;
-	while(true) {
-		result = result / 2;
-		if (result == 16) {
-			return 0;
-		}
-	}
-	return 1;
-}
-
-int get_one() {
-	int result = 128;
-	while(true) {
-		result = result / 2;
-		if (result == 8) {
-			return 1;
-		}
-	}
-	return 2;
-}
-
-int get_two() {
-	int result = 128;
-	while(true) {
-		result = result / 2;
-		if (result == 4) {
-			return 2;
-		}
-	}
-	return 1;
-}
-
-int get_three() {
-	int result = 128;
-	while(true) {
-		result = result / 2;
-		if (result == 32) {
-			return 3;
-		}
-	}
-	return 2;
-}
-
 int main(int argc, char *argv[])
 {
-	in = malloc(4);
-	out = malloc(4);
-	in[0] = '0';
-	in[1] = 'x';
-	in[2] = 'a';
-	in[3] = '\n';
-	int zero = get_zero();
-	int one = get_one();
-	int two = get_two();
-	int three = get_three();
-	out[zero] = in[zero];
-	out[one] = in[one];
-	out[two] = in[two];
-	out[three] = in[three];
-	syscall(__NR_write, 1, out, 4);
-	return 0;
+	char message[3];
+	message[0] = 0x41;
+	message[1] = 0x55;
+	message[2] = 0x41;
+	printf("%.*s", 3, message);
+	fflush(stdout);
+	syscall(__NR_exit, 0);
+	//return 0;
 }

group3/Makefile

@@ -1,6 +1,5 @@
 default:
-	$(CC) group3.s -c -g
-	$(LD) -o group3 group3.o -e main
+	$(CC) group3.s -g -o group3 -e main
 
 clean:
 	@rm -f group3.o group3

group3/group3.s

@@ -51,6 +51,15 @@ get_memory:
 	pop_all
 	return
 
+flush:
+	enter
+	push_all
+	xor	%eax, %eax
+	mov	stdout(%rip), %rdi
+	call	fflush
+	pop_all
+	return
+
 exit:
 	enter
 	push_all
@@ -145,7 +154,7 @@ close:
 	enter
 	push_all
 	mov	$CLOSE, %rax
-	lea	fh, %rdi
+	mov	fh, %rdi
 	syscall
 	pop_all
 	return
@@ -154,11 +163,11 @@ munmap:
 	enter
 	push_all
 	mov	$MUNMAP, %rax
-	lea	inbuf, %rdi
+	mov	inbuf, %rdi
 	mov	file_size(%rip), %rsi
 	syscall
 	mov	$MUNMAP, %rax
-	lea	out, %rdi
+	mov	out, %rdi
 	mov	file_size(%rip), %rsi
 	syscall
 	pop_all
@@ -192,14 +201,12 @@ print_lines_loop:
 	test	%r9, %r9
 	jz	print_lines_write_line
 	write	linebuf(%rip), $3
-	writeln
 print_lines_write_line:
 	mov	linebuf(%rip), %r10
 	add	$2, %r10			# skip two chars from linebuf
 	movb	$0x9, (%r10)			# replace third char with a tab
 	sub	$2, %rax
 	write	%r10, %rax
-	writeln
 	inc	%rbx
 	cmp	file_size(%rip), %rbx
 	jl	print_lines_loop
@@ -222,6 +229,7 @@ main:
 	mov	%rax, linebuf(%rip)
 	call	init_file
 	call	print_lines
+	call 	flush
 
 	call	close
 	call	munmap

print_int/print_int.s

@@ -86,6 +86,9 @@
 	pop	%rsi
 	.endm
 
+	.data
+	format: .asciz "%.*s\n"
+
 	.text
 	.globl main
 
@@ -133,11 +136,11 @@ write_string:
 	enter
 	push_all
 	push	%rax
-	mov	24(%rbp), %rsi			# param: address
-	mov	16(%rbp), %rdx			# param: size
-	mov	$WRITE, %rax
-	mov	$STDOUT, %rdi
-	syscall
+	lea	format(%rip), %rdi
+	mov	24(%rbp), %rdx			# param: address
+	mov	16(%rbp), %rsi			# param: size
+	mov	$0, %rax			# number of vector arguments
+	call	printf
 	pop	%rax
 	pop_all
 	return