Add MP Config

Added MP configuration tables setup.

Author: ykskb

Makefile

@@ -15,6 +15,7 @@ OBJS = \
 	interrupt.o\
 	kbd.o\
 	disk.o\
+	mp.o\
 	instructions_00.o\
 	instructions_10.o\
 	instructions_20.o\
@@ -33,6 +34,7 @@ OBJS = \
 	instructions_F0.o\
 	instructions_0F00.o\
 	instructions_0F20.o\
+	instructions_0F80.o\
 	instructions_0FB0.o
 
 CC = /usr/bin/gcc

emulator.c

@@ -18,7 +18,7 @@
         (byte & 0x02 ? '1' : '0'), \
         (byte & 0x01 ? '1' : '0')
 
-Emulator *create_emu(uint32_t eip, uint32_t esp)
+Emulator *create_emu(uint8_t *memory, uint32_t eip, uint32_t esp)
 {
     Emulator *emu = malloc(sizeof(Emulator));
 
@@ -32,7 +32,7 @@ Emulator *create_emu(uint32_t eip, uint32_t esp)
 
     /* Devices */
     emu->lapic = create_lapic(emu);
-    emu->memory = malloc(MEMORY_SIZE);
+    emu->memory = memory;
     emu->disk = NULL;
 
     /* Utility */
@@ -91,20 +91,18 @@ void dump_registers(Emulator *emu)
     printf("GDTR: %04x %08x\n", emu->gdtr.limit, emu->gdtr.base);
 }
 
-/*
-void dump_input(Emulator *emu)
-{
-    printf("Input:\n");
-    int i;
-    for (i = 0; i < MEMORY_SIZE; i++)
-    {
-        if (emu->memory[i])
-        {
-            printf("%08x\n", emu->memory[i]);
-        }
-    }
-}
-*/
+// void dump_input(Emulator *emu)
+// {
+//     printf("Input:\n");
+//     int i;
+//     for (i = 0; i < MEMORY_SIZE; i++)
+//     {
+//         if (emu->memory[i])
+//         {
+//             printf("%08x\n", emu->memory[i]);
+//         }
+//     }
+// }
 
 void dump_memory(Emulator *emu)
 {

emulator.h

@@ -162,7 +162,7 @@ struct LAPIC
     pthread_t *timer_thread;
 };
 
-Emulator *create_emu(uint32_t eip, uint32_t esp);
+Emulator *create_emu(uint8_t *memory, uint32_t eip, uint32_t esp);
 void destroy_emu(Emulator *emu);
 
 void attach_disk(Emulator *emu, Disk *disk);

io.c

@@ -5,32 +5,48 @@
 #include "kbd.h"
 
 /* 
- * 0x60
  * PS/2 (keyboard) Controller
- * in/out: Data Register
- * 
- * 0x64
- * PS/2 (keyboard) Controller
- * in: Status Register
- * out: Command Register
- * 
- * 0x3f8
- * Serial COM1 port: Convenience Implementation
- * Actual IO checks 0x03fd (status port) and read 
- * from 0x3f8 (data port) if data is there.
- * Also while loop below clears buffer if needed.
- * while ((ch = getchar()) != '\n' && ch != EOF) continue;
+ * 0x60: in|out: Data Register
+ * 0x64: in: Status Register | out: Command Register
+ */
+#define PS2DATA 0x60
+#define PS2STACMD 0x64
+
+/* 
+ * Serial (COM1)
+ * 0x3f8: in|out: Data port
+ * 0x3fd: in: Status port
+ */
+#define SERIALSTA 0x3fd
+#define SERIALDATA 0x3f8
+
+/*
+ * Disk
+ * 0x1F0: Data Register
+ * 0x1F2: in|out: Sector Count Register
+ * 0x1F3: in|out: LBA Low
+ * 0x1F4: in|out: LBA Mid
+ * 0x1F5: in|out: LBA High
+ * 0x1F6: in|out: Drive/Head Register
+ * 0x1F7: in: Status Register | out: Command Register
  */
+#define DISKDATA 0x1f0
+#define DISKSECCOUNT 0x1f2
+#define DISKLBALOW 0x1f3
+#define DISKLBAMID 0x1f4
+#define DISKLBAHIGH 0x1f5
+#define DISKDRVHEAD 0x1f6
+#define DISKSTACMD 0x1f7
 
 uint8_t io_in8(Emulator *emu, uint16_t address)
 {
     switch (address)
     {
-    case 0x64:
+    case PS2STACMD:
         return get_kbd_status();
-    case 0x1f7:
+    case DISKSTACMD:
         return get_disk_status(emu->disk);
-    case 0x3f8:
+    case SERIALDATA:
         return getchar();
     default:
         printf("IN8 on port %x not implemented.\n", address);
@@ -44,7 +60,7 @@ uint32_t io_in32(Emulator *emu, uint16_t address)
     {
     case 0x1F0:
         return read_disk_data32(emu->disk);
-    case 0x3f8:
+    case SERIALDATA:
         return getchar();
     default:
         printf("IN32 on port %x not implemented.\n", address);
@@ -56,31 +72,31 @@ void io_out8(Emulator *emu, uint16_t address, uint8_t value)
 {
     switch (address)
     {
-    case 0x60:
+    case PS2DATA:
         write_ps2_config_byte(value);
         break;
-    case 0x64:
+    case PS2STACMD:
         write_ps2_output_port(value);
         break;
-    case 0x1f2:
+    case DISKSECCOUNT:
         set_sec_count(emu->disk, value);
         break;
-    case 0x1f3:
+    case DISKLBALOW:
         set_lba_low(emu->disk, value);
         break;
-    case 0x1f4:
+    case DISKLBAMID:
         set_lba_mid(emu->disk, value);
         break;
-    case 0x1f5:
+    case DISKLBAHIGH:
         set_lba_high(emu->disk, value);
         break;
-    case 0x1f6:
+    case DISKDRVHEAD:
         set_drive_head(emu->disk, value);
         break;
-    case 0x1f7:
+    case DISKSTACMD:
         set_disk_command(emu->disk, value);
         break;
-    case 0x3f8:
+    case SERIALDATA:
         putchar(value);
         break;
     default:
@@ -93,7 +109,7 @@ void io_out32(Emulator *emu, uint16_t address, uint32_t value)
 {
     switch (address)
     {
-    case 0x3f8:
+    case SERIALDATA:
         putchar(value);
         break;
     default:

kbd.c

@@ -56,7 +56,7 @@ static void *kbd_loop()
         {
             kbd->buf_index += 1;
         }
-        ioapic_int_to_lapic(kbd->ioapic, T_IRQ0 + IRQ_KBD);
+        ioapic_int_to_lapic(T_IRQ0 + IRQ_KBD);
     }
     return NULL;
 }

main.c

@@ -9,6 +9,7 @@
 #include "ioapic.h"
 #include "disk.h"
 #include "kbd.h"
+#include "mp.h"
 
 int remove_arg_at(int argc, char *argv[], int index)
 {
@@ -56,11 +57,17 @@ int main(int argc, char *argv[])
         return 1;
     }
 
+    /* Main memory */
+    uint8_t *memory = malloc(MEMORY_SIZE);
+
     /*
      * Initial setup: EIP: 0x7c00, ESP: 0x7c00
      * BIOS places instructions at 0x7c00.
      */
-    emu = create_emu(0x7c00, 0x7c00);
+    emu = create_emu(memory, 0x7c00, 0x7c00);
+
+    /* BIOS configures MP settings */
+    set_mp_config(emu);
 
     /* Binary file loading */
     binary = fopen(argv[1], "rb"); // rb: read-binary (r: translated mode for "\n")