Changeset 143


Ignore:
Timestamp:
Jul 5, 2017, 10:56:06 AM (4 years ago)
Author:
max@…
Message:

style

Location:
trunk/hal/x86_64/core
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/hal/x86_64/core/hal_exception.c

    r142 r143  
    2727#include <core.h>
    2828#include <do_exception.h>
    29 
    3029
    3130#include <hal_kentry.h>
     
    7069        }
    7170
    72         x86_printf("\n****** FAULT OCCURRED ******\n");
     71        x86_printf("\n****** EXCEPTION OCCURRED ******\n");
    7372        x86_printf("%s\n", (char *)buf);
    7473        x86_printf("-> rip = %Z\n", tf->tf_rip);
     
    7776        if (excno == T_PAGEFLT)
    7877                x86_printf("-> va  = %Z\n", rcr2());
    79         x86_printf("****** FAULT OCCURRED ******\n\n");
     78        x86_printf("****** EXCEPTION OCCURRED ******\n\n");
    8079
    8180        while (1);
  • trunk/hal/x86_64/core/hal_segmentation.h

    r138 r143  
    11/*
    22 * hal_segmentation.h - Segmentation-related values and structures
    3  * 
     3 *
    44 * Copyright (c) 2017 Maxime Villard
    5  * 
     5 *
    66 * This file is part of ALMOS-MKH.
    77 *
     
    2929#define GDT_UCODE_SEL   3       /* User code descriptor */
    3030#define GDT_UDATA_SEL   4       /* User data descriptor */
    31 #define NGDT_MEM        6               /* aligned */
     31#define NGDT_MEM        6       /* aligned */
    3232
    3333#define GDT_CPU0TSS_SEL 0       /* cpu0's tss */
     
    203203
    204204/* debug only, will be removed soon */
    205 #define LAPIC_TIMER_VECTOR              (DYNVEC_MIN + 4)
     205#define LAPIC_TIMER_VECTOR      (DYNVEC_MIN + 4)
    206206#define IOAPIC_KEYBOARD_VECTOR  (DYNVEC_MIN + 5)
    207207
Note: See TracChangeset for help on using the changeset viewer.