base.cc (11877:5ea85692a53e) base.cc (12085:de78ea63e0ca)
1/*
2 * Copyright (c) 2011-2012,2016 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

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

224 functionTraceStream = simout.findOrCreate(fname)->stream();
225
226 currentFunctionStart = currentFunctionEnd = 0;
227 functionEntryTick = p->function_trace_start;
228
229 if (p->function_trace_start == 0) {
230 functionTracingEnabled = true;
231 } else {
1/*
2 * Copyright (c) 2011-2012,2016 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

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

224 functionTraceStream = simout.findOrCreate(fname)->stream();
225
226 currentFunctionStart = currentFunctionEnd = 0;
227 functionEntryTick = p->function_trace_start;
228
229 if (p->function_trace_start == 0) {
230 functionTracingEnabled = true;
231 } else {
232 typedef EventWrapper<BaseCPU, &BaseCPU::enableFunctionTrace> wrap;
233 Event *event = new wrap(this, true);
232 Event *event = new EventFunctionWrapper(
233 [this]{ enableFunctionTrace(); }, name(), true);
234 schedule(event, p->function_trace_start);
235 }
236 }
237
238 // The interrupts should always be present unless this CPU is
239 // switched in later or in case it is a checker CPU
240 if (!params()->switched_out && !is_checker) {
241 fatal_if(interrupts.size() != numThreads,

--- 544 unchanged lines hidden --- 		234 schedule(event, p->function_trace_start);
235 }
236 }
237
238 // The interrupts should always be present unless this CPU is
239 // switched in later or in case it is a checker CPU
240 if (!params()->switched_out && !is_checker) {
241 fatal_if(interrupts.size() != numThreads,

--- 544 unchanged lines hidden ---