Changeset 8802


Ignore:
Timestamp:
Mar 17, 2008, 7:01:45 AM (12 years ago)
Author:
gb
Message:

Win64 changes; use %llx vice %lx (at least in the places that I caught.)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/win64/lisp-kernel/lisp-debug.c

    r8561 r8802  
    8282{
    8383  int c;
     84
     85  fflush(stderr);
    8486  while (1) {
    8587    c = getchar();
     
    120122#endif
    121123#ifdef WINDOWS
    122 /* is this correct? */
    123 char* Iregnames[] = {"r8 ","r9 ","r10","r11","r12","r13","r14","r15",
    124                      "rdi","rsi","rbp", "rbx", "rdx", "rax", "rcx","rsp"};
     124char* Iregnames[] = {"rax ","rcx ","rdx","rbx","rsp","rrbp","rsi","rdi",
     125                     "r8","r9","r10", "r11", "r12", "r13", "r14","r15"};
    125126#endif
    126127#endif
     
    129130show_lisp_register(ExceptionInformation *xp, char *label, int r)
    130131{
     132
     133  extern char* print_lisp_object(LispObj);
    131134
    132135  LispObj val = xpGPR(xp, r);
     
    599602
    600603#ifdef X8664
    601   fprintf(stderr,"%rax = 0x%016lX      %r8  = 0x%016lX\n", xpGPR(xp,REG_RAX),xpGPR(xp,REG_R8));
    602   fprintf(stderr,"%rcx = 0x%016lX      %r9  = 0x%016lX\n", xpGPR(xp,REG_RCX),xpGPR(xp,REG_R9));
    603   fprintf(stderr,"%rdx = 0x%016lX      %r10 = 0x%016lX\n", xpGPR(xp,REG_RDX),xpGPR(xp,REG_R10));
    604   fprintf(stderr,"%rbx = 0x%016lX      %r11 = 0x%016lX\n", xpGPR(xp,REG_RBX),xpGPR(xp,REG_R11));
    605   fprintf(stderr,"%rsp = 0x%016lX      %r12 = 0x%016lX\n", xpGPR(xp,REG_RSP),xpGPR(xp,REG_R12));
    606   fprintf(stderr,"%rbp = 0x%016lX      %r13 = 0x%016lX\n", xpGPR(xp,REG_RBP),xpGPR(xp,REG_R13));
    607   fprintf(stderr,"%rsi = 0x%016lX      %r14 = 0x%016lX\n", xpGPR(xp,REG_RSI),xpGPR(xp,REG_R14));
    608   fprintf(stderr,"%rdi = 0x%016lX      %r15 = 0x%016lX\n", xpGPR(xp,REG_RDI),xpGPR(xp,REG_R15));
    609   fprintf(stderr,"%rip = 0x%016lX   %rflags = 0x%016lX\n",
    610           xpGPR(xp, Iip), xpGPR(xp, Iflags));
     604  fprintf(stderr,"%rax = 0x%016llX      %r8  = 0x%016llX\n", xpGPR(xp,REG_RAX),xpGPR(xp,REG_R8));
     605  fprintf(stderr,"%rcx = 0x%016llX      %r9  = 0x%016llX\n", xpGPR(xp,REG_RCX),xpGPR(xp,REG_R9));
     606  fprintf(stderr,"%rdx = 0x%016llX      %r10 = 0x%016llX\n", xpGPR(xp,REG_RDX),xpGPR(xp,REG_R10));
     607  fprintf(stderr,"%rbx = 0x%016llX      %r11 = 0x%016llX\n", xpGPR(xp,REG_RBX),xpGPR(xp,REG_R11));
     608  fprintf(stderr,"%rsp = 0x%016llX      %r12 = 0x%016llX\n", xpGPR(xp,REG_RSP),xpGPR(xp,REG_R12));
     609  fprintf(stderr,"%rbp = 0x%016llX      %r13 = 0x%016llX\n", xpGPR(xp,REG_RBP),xpGPR(xp,REG_R13));
     610  fprintf(stderr,"%rsi = 0x%016llX      %r14 = 0x%016llX\n", xpGPR(xp,REG_RSI),xpGPR(xp,REG_R14));
     611  fprintf(stderr,"%rdi = 0x%016llX      %r15 = 0x%016llX\n", xpGPR(xp,REG_RDI),xpGPR(xp,REG_R15));
     612  fprintf(stderr,"%rip = 0x%016llX   %rflags = 0x%016lX\n",
     613          xpGPR(xp, Iip), eflags_register(xp));
    611614#endif
    612615  return debug_continue;
     
    908911  while (state == debug_continue) {
    909912#ifdef WINDOWS
    910     fprintf(stderr, "[%d] OpenMCL kernel debugger: ", 23 /* FIXME */);
     913    fprintf(stderr, "[%d] OpenMCL kernel debugger: ", GetCurrentProcessId());
    911914#else
    912915    fprintf(stderr, "[%d] OpenMCL kernel debugger: ", main_thread_pid);
Note: See TracChangeset for help on using the changeset viewer.