1.1 --- a/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp Tue Apr 29 22:04:09 2014 -0700
1.2 +++ b/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp Tue Apr 29 22:05:10 2014 -0700
1.3 @@ -302,29 +302,30 @@
1.4 if (context == NULL) return;
1.5
1.6 ucontext_t *uc = (ucontext_t*)context;
1.7 + sigcontext* sc = (sigcontext*)context;
1.8 intptr_t *sp = (intptr_t *)os::Linux::ucontext_get_sp(uc);
1.9
1.10 st->print_cr("Register to memory mapping:");
1.11 st->cr();
1.12
1.13 // this is only for the "general purpose" registers
1.14 - st->print("G1="); print_location(st, SIG_REGS(sc).u_regs[CON__G1]);
1.15 - st->print("G2="); print_location(st, SIG_REGS(sc).u_regs[CON__G2]);
1.16 - st->print("G3="); print_location(st, SIG_REGS(sc).u_regs[CON__G3]);
1.17 - st->print("G4="); print_location(st, SIG_REGS(sc).u_regs[CON__G4]);
1.18 - st->print("G5="); print_location(st, SIG_REGS(sc).u_regs[CON__G5]);
1.19 - st->print("G6="); print_location(st, SIG_REGS(sc).u_regs[CON__G6]);
1.20 - st->print("G7="); print_location(st, SIG_REGS(sc).u_regs[CON__G7]);
1.21 + st->print("G1="); print_location(st, SIG_REGS(sc).u_regs[CON_G1]);
1.22 + st->print("G2="); print_location(st, SIG_REGS(sc).u_regs[CON_G2]);
1.23 + st->print("G3="); print_location(st, SIG_REGS(sc).u_regs[CON_G3]);
1.24 + st->print("G4="); print_location(st, SIG_REGS(sc).u_regs[CON_G4]);
1.25 + st->print("G5="); print_location(st, SIG_REGS(sc).u_regs[CON_G5]);
1.26 + st->print("G6="); print_location(st, SIG_REGS(sc).u_regs[CON_G6]);
1.27 + st->print("G7="); print_location(st, SIG_REGS(sc).u_regs[CON_G7]);
1.28 st->cr();
1.29
1.30 - st->print("O0="); print_location(st, SIG_REGS(sc).u_regs[CON__O0]);
1.31 - st->print("O1="); print_location(st, SIG_REGS(sc).u_regs[CON__O1]);
1.32 - st->print("O2="); print_location(st, SIG_REGS(sc).u_regs[CON__O2]);
1.33 - st->print("O3="); print_location(st, SIG_REGS(sc).u_regs[CON__O3]);
1.34 - st->print("O4="); print_location(st, SIG_REGS(sc).u_regs[CON__O4]);
1.35 - st->print("O5="); print_location(st, SIG_REGS(sc).u_regs[CON__O5]);
1.36 - st->print("O6="); print_location(st, SIG_REGS(sc).u_regs[CON__O6]);
1.37 - st->print("O7="); print_location(st, SIG_REGS(sc).u_regs[CON__O7]);
1.38 + st->print("O0="); print_location(st, SIG_REGS(sc).u_regs[CON_O0]);
1.39 + st->print("O1="); print_location(st, SIG_REGS(sc).u_regs[CON_O1]);
1.40 + st->print("O2="); print_location(st, SIG_REGS(sc).u_regs[CON_O2]);
1.41 + st->print("O3="); print_location(st, SIG_REGS(sc).u_regs[CON_O3]);
1.42 + st->print("O4="); print_location(st, SIG_REGS(sc).u_regs[CON_O4]);
1.43 + st->print("O5="); print_location(st, SIG_REGS(sc).u_regs[CON_O5]);
1.44 + st->print("O6="); print_location(st, SIG_REGS(sc).u_regs[CON_O6]);
1.45 + st->print("O7="); print_location(st, SIG_REGS(sc).u_regs[CON_O7]);
1.46 st->cr();
1.47
1.48 st->print("L0="); print_location(st, sp[L0->sp_offset_in_saved_window()]);
1.49 @@ -516,7 +517,7 @@
1.50 if (nativeInstruction_at(*pc)->is_ic_miss_trap()) {
1.51 #ifdef ASSERT
1.52 #ifdef TIERED
1.53 - CodeBlob* cb = CodeCache::find_blob_unsafe(pc);
1.54 + CodeBlob* cb = CodeCache::find_blob_unsafe(*pc);
1.55 assert(cb->is_compiled_by_c2(), "Wrong compiler");
1.56 #endif // TIERED
1.57 #endif // ASSERT
