timer_cpulocal.cc (8993:d5f9445010da) timer_cpulocal.cc (9157:e0bad9d7bbd6)
1/*
2 * Copyright (c) 2010-2011 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

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

53 // Initialize the timer registers for each per cpu timer
54 for (int i = 0; i < CPU_MAX; i++) {
55 std::stringstream oss;
56 oss << name() << ".timer" << i;
57 localTimer[i]._name = oss.str();
58 localTimer[i].parent = this;
59 localTimer[i].intNumTimer = p->int_num_timer;
60 localTimer[i].intNumWatchdog = p->int_num_watchdog;
1/*
2 * Copyright (c) 2010-2011 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

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

53 // Initialize the timer registers for each per cpu timer
54 for (int i = 0; i < CPU_MAX; i++) {
55 std::stringstream oss;
56 oss << name() << ".timer" << i;
57 localTimer[i]._name = oss.str();
58 localTimer[i].parent = this;
59 localTimer[i].intNumTimer = p->int_num_timer;
60 localTimer[i].intNumWatchdog = p->int_num_watchdog;
61 localTimer[i].clock = p->clock;
61 localTimer[i].clock = clock;
62 localTimer[i].cpuNum = i;
63 }
64 pioSize = 0x38;
65}
66
67CpuLocalTimer::Timer::Timer()
68 : timerControl(0x0), watchdogControl(0x0), rawIntTimer(false), rawIntWatchdog(false),
69 rawResetWatchdog(false), watchdogDisableReg(0x0), pendingIntTimer(false), pendingIntWatchdog(false),

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

334}
335
336void
337CpuLocalTimer::Timer::serialize(std::ostream &os)
338{
339 DPRINTF(Checkpoint, "Serializing Arm CpuLocalTimer\n");
340 SERIALIZE_SCALAR(intNumTimer);
341 SERIALIZE_SCALAR(intNumWatchdog);
62 localTimer[i].cpuNum = i;
63 }
64 pioSize = 0x38;
65}
66
67CpuLocalTimer::Timer::Timer()
68 : timerControl(0x0), watchdogControl(0x0), rawIntTimer(false), rawIntWatchdog(false),
69 rawResetWatchdog(false), watchdogDisableReg(0x0), pendingIntTimer(false), pendingIntWatchdog(false),

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

334}
335
336void
337CpuLocalTimer::Timer::serialize(std::ostream &os)
338{
339 DPRINTF(Checkpoint, "Serializing Arm CpuLocalTimer\n");
340 SERIALIZE_SCALAR(intNumTimer);
341 SERIALIZE_SCALAR(intNumWatchdog);
342 SERIALIZE_SCALAR(clock);
343
344 uint32_t timer_control_serial = timerControl;
345 uint32_t watchdog_control_serial = watchdogControl;
346 SERIALIZE_SCALAR(timer_control_serial);
347 SERIALIZE_SCALAR(watchdog_control_serial);
348
349 SERIALIZE_SCALAR(rawIntTimer);
350 SERIALIZE_SCALAR(rawIntWatchdog);

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

374
375void
376CpuLocalTimer::Timer::unserialize(Checkpoint *cp, const std::string &section)
377{
378 DPRINTF(Checkpoint, "Unserializing Arm CpuLocalTimer\n");
379
380 UNSERIALIZE_SCALAR(intNumTimer);
381 UNSERIALIZE_SCALAR(intNumWatchdog);
342
343 uint32_t timer_control_serial = timerControl;
344 uint32_t watchdog_control_serial = watchdogControl;
345 SERIALIZE_SCALAR(timer_control_serial);
346 SERIALIZE_SCALAR(watchdog_control_serial);
347
348 SERIALIZE_SCALAR(rawIntTimer);
349 SERIALIZE_SCALAR(rawIntWatchdog);

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

373
374void
375CpuLocalTimer::Timer::unserialize(Checkpoint *cp, const std::string &section)
376{
377 DPRINTF(Checkpoint, "Unserializing Arm CpuLocalTimer\n");
378
379 UNSERIALIZE_SCALAR(intNumTimer);
380 UNSERIALIZE_SCALAR(intNumWatchdog);
382 UNSERIALIZE_SCALAR(clock);
383
384 uint32_t timer_control_serial;
385 UNSERIALIZE_SCALAR(timer_control_serial);
386 timerControl = timer_control_serial;
387 uint32_t watchdog_control_serial;
388 UNSERIALIZE_SCALAR(watchdog_control_serial);
389 watchdogControl = watchdog_control_serial;
390

--- 50 unchanged lines hidden --- 		381
382 uint32_t timer_control_serial;
383 UNSERIALIZE_SCALAR(timer_control_serial);
384 timerControl = timer_control_serial;
385 uint32_t watchdog_control_serial;
386 UNSERIALIZE_SCALAR(watchdog_control_serial);
387 watchdogControl = watchdog_control_serial;
388

--- 50 unchanged lines hidden ---