Changeset 31 for trunk/hal/x86_64

Timestamp:

Jun 21, 2017, 8:53:24 AM (8 years ago)

Author:

max@…

Message:

Silence a few gcc warnings.

Location:

trunk/hal/x86_64

Files:

• hal_init.c (modified) (1 diff)
• hal_segmentation.h (modified) (1 diff)
• hal_trap.c (modified) (3 diffs)
• x86_printf.c (modified) (1 diff)

trunk/hal/x86_64/hal_init.c

@@ -168 +168 @@
         idt = (struct idt_seg *)&idtstore;
         for (i = 0; i < NCPUIDT; i++) {
-                idt_set_seg(&idt[i], x86_traps[i], 0, SDT_SYS386IGT,
+                idt_set_seg(&idt[i], (void *)x86_traps[i], 0, SDT_SYS386IGT,
                     SEL_KPL, GDT_FIXED_SEL(GDT_KCODE_SEL, SEL_KPL));
         }

trunk/hal/x86_64/hal_segmentation.h

@@ -148 +148 @@
 void lgdt(struct region_descriptor *);
 void lidt(struct region_descriptor *);
-void ltr(u_short);
+void ltr(uint16_t);
 
 #endif /* !x86_ASM */

trunk/hal/x86_64/hal_trap.c

@@ -47 +47 @@
 int     trap_types = __arraycount(trap_type);
 
-void x86_printf(char *msg); // XXX
+void x86_printf(char *s, ...);
 
 /*
@@ -56 +56 @@
 {
         uint64_t trapno = tf->tf_trapno;
-        char *buf;
+        const char *buf;
 
         if (trapno < trap_types) {
@@ -66 +66 @@
         x86_printf("\n");
         x86_printf("****** FAULT OCCURRED ******\n");
-        x86_printf(buf);
+        x86_printf((char *)buf);
         x86_printf("\n");
         x86_printf("****** FAULT OCCURRED ******\n");

trunk/hal/x86_64/x86_printf.c

@@ -42 +42 @@
 static void x86_putc(char c)
 {
-        size_t i;
-
         if (c == '\n') {
                 cons_ptr = roundup(cons_ptr, CONS_X_SIZE);