exetrace.cc (7680:f4eda002333b) exetrace.cc (7720:65d338a8dba4)
1/*
2 * Copyright (c) 2001-2005 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 58 unchanged lines hidden (view full) ---

67 if (IsOn(ExecSpeculative))
68 outs << (misspeculating ? "-" : "+") << " ";
69
70 if (IsOn(ExecThread))
71 outs << "T" << thread->threadId() << " : ";
72
73 std::string sym_str;
74 Addr sym_addr;
1/*
2 * Copyright (c) 2001-2005 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 58 unchanged lines hidden (view full) ---

67 if (IsOn(ExecSpeculative))
68 outs << (misspeculating ? "-" : "+") << " ";
69
70 if (IsOn(ExecThread))
71 outs << "T" << thread->threadId() << " : ";
72
73 std::string sym_str;
74 Addr sym_addr;
75 Addr cur_pc = PC;
76#if THE_ISA == ARM_ISA
77 cur_pc &= ~PcModeMask;
78#endif
75 Addr cur_pc = pc.instAddr();
79 if (debugSymbolTable
80 && IsOn(ExecSymbol)
81#if FULL_SYSTEM
82 && !inUserMode(thread)
83#endif
84 && debugSymbolTable->findNearestSymbol(cur_pc, sym_str, sym_addr)) {
85 if (cur_pc != sym_addr)
86 sym_str += csprintf("+%d",cur_pc - sym_addr);
87 outs << "@" << sym_str;
76 if (debugSymbolTable
77 && IsOn(ExecSymbol)
78#if FULL_SYSTEM
79 && !inUserMode(thread)
80#endif
81 && debugSymbolTable->findNearestSymbol(cur_pc, sym_str, sym_addr)) {
82 if (cur_pc != sym_addr)
83 sym_str += csprintf("+%d",cur_pc - sym_addr);
84 outs << "@" << sym_str;
88 }
89 else {
85 } else {
90 outs << "0x" << hex << cur_pc;
91 }
92
93 if (inst->isMicroop()) {
86 outs << "0x" << hex << cur_pc;
87 }
88
89 if (inst->isMicroop()) {
94 outs << "." << setw(2) << dec << upc;
90 outs << "." << setw(2) << dec << pc.microPC();
95 } else {
96 outs << " ";
97 }
98
99 outs << " : ";
100
101 //
102 // Print decoded instruction

--- 70 unchanged lines hidden --- 		91 } else {
92 outs << " ";
93 }
94
95 outs << " : ";
96
97 //
98 // Print decoded instruction

--- 70 unchanged lines hidden ---