Changeset 78


Ignore:
Timestamp:
Jun 27, 2017, 5:19:53 PM (4 years ago)
Author:
max@…
Message:

print %rip, and add cli/sti

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

Legend:

Unmodified
Added
Removed
  • trunk/hal/x86_64/core/hal_cpu.S

    r51 r78  
    3939        ret
    4040
     41ASM_ENTRY(sti)
     42        sti
     43        ret
     44
     45ASM_ENTRY(cli)
     46        cli
     47        ret
     48
    4149ASM_ENTRY(rdmsr)
    4250        movq    %rdi,%rcx
  • trunk/hal/x86_64/core/hal_internal.h

    r51 r78  
    3131/* hal_cpu.S */
    3232void invlpg(vaddr_t va);
     33void sti();
     34void cli();
    3335uint64_t rdmsr(uint32_t);
    3436void wrmsr(uint32_t, uint64_t);
  • trunk/hal/x86_64/core/hal_trap.c

    r51 r78  
    6464        }
    6565
    66         x86_printf("\n");
    67         x86_printf("****** FAULT OCCURRED ******\n");
    68         x86_printf((char *)buf);
    69         x86_printf("\n");
    70         x86_printf("****** FAULT OCCURRED ******\n");
    71         x86_printf("\n");
     66        x86_printf("\n****** FAULT OCCURRED ******\n");
     67        x86_printf("%s\n", (char *)buf);
     68        x86_printf("-> rip = %Z\n", tf->tf_rip);
     69        x86_printf("****** FAULT OCCURRED ******\n\n");
    7270
    7371        while (1);
Note: See TracChangeset for help on using the changeset viewer.