Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 84439d7 in mainline for kernel/arch/ia32/src/interrupt.c


Ignore:
Timestamp:
2010-12-05T09:34:46Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
75732da
Parents:
56b962d (diff), 35537a7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge with development/

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ia32/src/interrupt.c

    r56b962d r84439d7  
    6565void istate_decode(istate_t *istate)
    6666{
    67         printf("cs =%p\teip=%p\tefl=%p\terr=%p\n",
    68             istate->cs, istate->eip, istate->eflags, istate->error_word);
    69 
    70         printf("ds =%p\tes =%p\tfs =%p\tgs =%p\n",
     67        printf("cs =%#0" PRIx32 "\teip=%p\t"
     68            "efl=%#0" PRIx32 "\terr=%#0" PRIx32 "\n",
     69            istate->cs, (void *) istate->eip,
     70            istate->eflags, istate->error_word);
     71       
     72        printf("ds =%#0" PRIx32 "\tes =%#0" PRIx32 "\t"
     73            "fs =%#0" PRIx32 "\tgs =%#0" PRIx32 "\n",
    7174            istate->ds, istate->es, istate->fs, istate->gs);
     75       
    7276        if (istate_from_uspace(istate))
    73                 printf("ss =%p\n", istate->ss);
    74 
    75         printf("eax=%p\tebx=%p\tecx=%p\tedx=%p\n",
     77                printf("ss =%#0" PRIx32 "\n", istate->ss);
     78       
     79        printf("eax=%#0" PRIx32 "\tebx=%#0" PRIx32 "\t"
     80            "ecx=%#0" PRIx32 "\tedx=%#0" PRIx32 "\n",
    7681            istate->eax, istate->ebx, istate->ecx, istate->edx);
     82       
    7783        printf("esi=%p\tedi=%p\tebp=%p\tesp=%p\n",
    78             istate->esi, istate->edi, istate->ebp,
    79             istate_from_uspace(istate) ? istate->esp : (uintptr_t)&istate->esp);
     84            (void *) istate->esi, (void *) istate->edi,
     85            (void *) istate->ebp,
     86            istate_from_uspace(istate) ? ((void *) istate->esp) :
     87            &istate->esp);
    8088}
    8189
     
    139147        );
    140148       
    141         fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR=%#0.8x.",
    142             (unative_t) mxcsr);
    143         panic_badtrap(istate, n, "SIMD FP exception, MXCSR=%#0.8x");
     149        fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR=%#0" PRIx32 ".",
     150            mxcsr);
     151        panic_badtrap(istate, n, "SIMD FP exception");
    144152}
    145153
Note: See TracChangeset for help on using the changeset viewer.