Step harib17c: Add put char app

page 402 ~ 406
M366 · Aug 15, 2020 · 8bb4eeb · 8bb4eeb
1 parent 51f67fd
commit 8bb4eeb
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/harib/bootpack.h b/harib/bootpack.h
@@ -38,6 +38,7 @@ void asm_inthandler27(void);
 void asm_inthandler2c(void);
 unsigned int memtest_sub(unsigned int start, unsigned int end);
 void farjmp(int eip, int cs);
+void asm_cons_putchar(void);
 
 //
 // fifo.c

diff --git a/harib/console.c b/harib/console.c
@@ -16,6 +16,7 @@ void console_task(struct SHEET *sheet, unsigned int memtotal)
 	cons.cur_x =  8;
 	cons.cur_y = 28;
 	cons.cur_c = -1;
+    *((int *) 0x0fec) = (int) &cons; // store the address of cons
 
 	fifo32_init(&task->fifo, 128, fifobuf, task);
 	timer = timer_alloc();

diff --git a/harib/hlt.nas b/harib/hlt.nas
@@ -1,4 +1,6 @@
 [BITS 32]
+        MOV     AL, 'A'
+        CALL    2*8:0xbe3
 fin:
-    HLT
-    JMP fin
+        HLT
+        JMP     fin
diff --git a/harib/naskfunc.nas b/harib/naskfunc.nas
@@ -17,8 +17,10 @@
 		GLOBAL	_asm_inthandler27, _asm_inthandler2c
         GLOBAL  _memtest_sub
         GLOBAL  _farjmp
+        GLOBAL  _asm_cons_putchar
         EXTERN  _inthandler20, _inthandler21
 		EXTERN	_inthandler27, _inthandler2c
+        EXTERN  _cons_putchar
 
 [SECTION .text]         ; begin .text section
 
@@ -211,3 +213,13 @@ mts_fin:
 _farjmp:		; void farjmp(int eip, int cs);
 		JMP		FAR	[ESP+4]				; eip, cs
 		RET
+
+_asm_cons_putchar:
+		PUSH	1
+		AND		EAX,0xff	; AHやEAXの上位を0にして、EAXに文字コードが入った状態にする。
+		PUSH	EAX
+		PUSH	DWORD [0x0fec]	; メモリの内容を読み込んでその値をPUSHする 0x0fec: an address of cons
+		CALL	_cons_putchar
+		ADD		ESP,12		; スタックに積んだデータを捨てる
+		RETF
+