| branch.isa (3273:5aa5cc05fff9) | branch.isa (3787:023ac8d894a3) |
|---|---|
| 1// Copyright (c) 2006 The Regents of The University of Michigan 2// All rights reserved. 3// 4// Redistribution and use in source and binary forms, with or without 5// modification, are permitted provided that the following conditions are 6// met: redistributions of source code must retain the above copyright 7// notice, this list of conditions and the following disclaimer; 8// redistributions in binary form must reproduce the above copyright --- 156 unchanged lines hidden (view full) --- 165 std::string symbol; 166 Addr symbolAddr; 167 168 Addr target = disp + pc; 169 170 printMnemonic(response, mnemonic); 171 ccprintf(response, "0x%x", target); 172 | 1// Copyright (c) 2006 The Regents of The University of Michigan 2// All rights reserved. 3// 4// Redistribution and use in source and binary forms, with or without 5// modification, are permitted provided that the following conditions are 6// met: redistributions of source code must retain the above copyright 7// notice, this list of conditions and the following disclaimer; 8// redistributions in binary form must reproduce the above copyright --- 156 unchanged lines hidden (view full) --- 165 std::string symbol; 166 Addr symbolAddr; 167 168 Addr target = disp + pc; 169 170 printMnemonic(response, mnemonic); 171 ccprintf(response, "0x%x", target); 172 |
| 173 if(symtab->findNearestSymbol(target, symbol, symbolAddr)) | 173 if(symtab && symtab->findNearestSymbol(target, symbol, symbolAddr)) |
| 174 { 175 ccprintf(response, " <%s", symbol); 176 if(symbolAddr != target) 177 ccprintf(response, "+%d>", target - symbolAddr); 178 else 179 ccprintf(response, ">"); 180 } | 174 { 175 ccprintf(response, " <%s", symbol); 176 if(symbolAddr != target) 177 ccprintf(response, "+%d>", target - symbolAddr); 178 else 179 ccprintf(response, ">"); 180 } |
| 181 else 182 { 183 ccprintf(response, "<%d>", target); 184 } |
|
| 181 182 return response.str(); 183 } 184}}; 185 186def template BranchExecute {{ 187 Fault %(class_name)s::execute(%(CPU_exec_context)s *xc, 188 Trace::InstRecord *traceData) const --- 84 unchanged lines hidden --- | 185 186 return response.str(); 187 } 188}}; 189 190def template BranchExecute {{ 191 Fault %(class_name)s::execute(%(CPU_exec_context)s *xc, 192 Trace::InstRecord *traceData) const --- 84 unchanged lines hidden --- |