utility.cc (8782:10c9297e14d5) utility.cc (8799:dac1e33e07b0)
1/*
2 * Copyright (c) 2009-2010 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

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

39
40
41#include "arch/arm/faults.hh"
42#include "arch/arm/isa_traits.hh"
43#include "arch/arm/tlb.hh"
44#include "arch/arm/utility.hh"
45#include "arch/arm/vtophys.hh"
46#include "cpu/thread_context.hh"
1/*
2 * Copyright (c) 2009-2010 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

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

39
40
41#include "arch/arm/faults.hh"
42#include "arch/arm/isa_traits.hh"
43#include "arch/arm/tlb.hh"
44#include "arch/arm/utility.hh"
45#include "arch/arm/vtophys.hh"
46#include "cpu/thread_context.hh"
47#include "mem/vport.hh"
47#include "mem/fs_translating_port_proxy.hh"
48#include "sim/full_system.hh"
49
50namespace ArmISA {
51
52void
53initCPU(ThreadContext *tc, int cpuId)
54{
55 // Reset CP15?? What does that mean -- ali

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

81 tmp = tc->readIntReg(number++);
82 tmp |= tc->readIntReg(number) << 32;
83 return tmp;
84 } else {
85 return tc->readIntReg(number);
86 }
87 } else {
88 Addr sp = tc->readIntReg(StackPointerReg);
48#include "sim/full_system.hh"
49
50namespace ArmISA {
51
52void
53initCPU(ThreadContext *tc, int cpuId)
54{
55 // Reset CP15?? What does that mean -- ali

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

81 tmp = tc->readIntReg(number++);
82 tmp |= tc->readIntReg(number) << 32;
83 return tmp;
84 } else {
85 return tc->readIntReg(number);
86 }
87 } else {
88 Addr sp = tc->readIntReg(StackPointerReg);
89 VirtualPort *vp = tc->getVirtPort();
89 FSTranslatingPortProxy* vp = tc->getVirtProxy();
90 uint64_t arg;
91 if (size == sizeof(uint64_t)) {
92 // If the argument is even it must be aligned
93 if ((number % 2) != 0)
94 number++;
95 arg = vp->read<uint64_t>(sp +
96 (number-NumArgumentRegs) * sizeof(uint32_t));
97 // since two 32 bit args == 1 64 bit arg, increment number

--- 70 unchanged lines hidden --- 		90 uint64_t arg;
91 if (size == sizeof(uint64_t)) {
92 // If the argument is even it must be aligned
93 if ((number % 2) != 0)
94 number++;
95 arg = vp->read<uint64_t>(sp +
96 (number-NumArgumentRegs) * sizeof(uint32_t));
97 // since two 32 bit args == 1 64 bit arg, increment number

--- 70 unchanged lines hidden ---