Fix: Syntax error and qemu script

Author: bajdcc

Makefile

@@ -34,15 +34,11 @@ UOBJS := $(UPROGS:%=%.o)
 
 # default task
 default: Makefile
-	$(MAKE) bin/floppy.raw
 	$(MAKE) bin/floppy.img
 
 # create a 1.44MB floppy include kernel and bootsector
-bin/floppy.raw: boot/floppy.asm bin/bootsect.bin bin/kernel 
+bin/floppy.img: boot/floppy.asm bin/bootsect.bin bin/kernel 
 	$(AS) -I ./bin/ -f bin -l lst/floppy.s $< -o $@ 
-	
-bin/floppy.img:
-	$(IMG) convert -f raw -O qcow2 bin/floppy.raw bin/floppy.img
 
 # bootsector
 bin/bootsect.bin: boot/bootsect.asm 
@@ -82,24 +78,26 @@ init:
 # make a disk with minix v1 file system
 fs: $(UPROGS)
 	$(DEL) bin/rootfs.img
-	$(IMG) create -f raw bin/rootfs.raw 10M
-	$(MKFS) bin/rootfs.raw -1 -n14
-	sudo mount -o loop -t minix bin/rootfs.raw $(ROOTFS)
+	$(IMG) create -f raw bin/rootfs.img 10M
+	$(MKFS) bin/rootfs.img -1 -n14
+	sudo mount -o loop -t minix bin/rootfs.img $(ROOTFS)
 	mkdir $(ROOTFS)/bin
 	mkdir $(ROOTFS)/share
 	cp usr/logo.txt $(ROOTFS)/share
 	for i in $(UPROGS); do cp $$i $(ROOTFS)/bin; done
 	sleep 1
 	sudo umount $(ROOTFS)
-	$(IMG) convert -f raw -O qcow2 bin/rootfs.raw bin/rootfs.img
 
 # check root file system
 fsck:
-	$(FSCK) -fsl bin/rootfs.raw
+	$(FSCK) -fsl bin/rootfs.img
 
 # run with qemu
 run:
-	$(QEMU) -S -s -fda bin/floppy.img -hda bin/rootfs.img -boot a &
+	$(QEMU) -S -s \
+		-drive file=bin/floppy.img,if=floppy,format=raw \
+		-drive file=bin/rootfs.img,if=ide,format=raw,cyls=20,heads=16,secs=63 \
+	    -boot a -m 512 &
 	sleep 1
 	$(GDB) -x script/gdbinit
 

include/isr.h

@@ -16,7 +16,7 @@ struct int_frame {
     uint32_t gs;    // 16 bits
     uint32_t fs;    // 16 bits
     uint32_t es;    // 16 bits
-    uint32_t ds;          // 16 bits
+    uint32_t ds;    // 16 bits
 
     /* registers save by pusha */
     uint32_t edi;

script/gdbinit

@@ -2,5 +2,5 @@ target remote localhost:1234
 symbol-file bin/kernel.elf
 b fault_handler
 b panic
-b context_switch
+b exec
 c

src/kernel/fault.c

@@ -146,7 +146,7 @@ void fault_handler(struct int_frame *r) {
             print("error code: %d\n", r->err_code);
             panic(fault_msg[r->int_no]);
         } else {
-            panic("Unkonwn Interrupt, System Halted!\n");
+            panic("Unknown Interrupt, System Halted!\n");
         }
     }
 

src/kernel/idt.c

@@ -5,6 +5,7 @@
 
 // std
 #include <type.h>
+#include <print.h>
 // x86
 #include <pm.h>
 // lib

src/proc/exec.c

@@ -38,7 +38,6 @@ int exec(char *path, char **argv) {
     if (iread(ip, (char *)&eh, 0, sizeof(eh)) < (int)sizeof(eh)) {
         goto bad;
     }
-    // print_elfhdr(&eh);
 
     if (eh.magic != ELF_MAGIC) {
         goto bad;

src/user/cinit.c

@@ -1,19 +1,19 @@
 #include <usys.h>
 #include <uio.h>
 
-int main(){
+int main() {
     char *argv[] = {"sh", 0};
 
-    if (uio_init() < 0){
+    if (uio_init() < 0) {
         goto bad;     
     }
 
     int pid = _fork();
-    if (pid == 0){
-        if (_exec("/bin/sh", argv) < 0){
+    if (pid == 0) {
+        if (_exec("/bin/sh", argv) < 0) {
             goto bad;
         }
-    } else if (pid < 0){
+    } else if (pid < 0) {
         goto bad;
     }