changeset c744483edfcf in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=c744483edfcf
description:
MEM: Make port proxies use references rather than pointers
This patch is adding a clearer design intent to all objects that would
not be complete without a port proxy by making the proxies members
rathen than dynamically allocated. In essence, if NULL would not be a
valid value for the proxy, then we avoid using a pointer to make this
clear.
The same approach is used for the methods using these proxies, such as
loadSections, that now use references rather than pointers to better
reflect the fact that NULL would not be an acceptable value (in fact
the code would break and that is how this patch started out).
Overall the concept of "using a reference to express unconditional
composition where a NULL pointer is never valid" could be done on a
much broader scale throughout the code base, but for now it is only
done in the locations affected by the proxies.
diffstat:
src/arch/alpha/freebsd/system.cc | 4 +-
src/arch/alpha/linux/system.cc | 18 ++++-----
src/arch/alpha/linux/threadinfo.hh | 4 +-
src/arch/alpha/process.cc | 6 +-
src/arch/alpha/stacktrace.cc | 24 +++++-------
src/arch/alpha/system.cc | 14 +++---
src/arch/alpha/tru64/system.cc | 2 +-
src/arch/alpha/utility.cc | 7 ++-
src/arch/alpha/vtophys.cc | 8 ++--
src/arch/alpha/vtophys.hh | 2 +-
src/arch/arm/linux/process.cc | 10 ++--
src/arch/arm/linux/system.cc | 2 +-
src/arch/arm/process.cc | 14 +++---
src/arch/arm/stacktrace.cc | 14 +++----
src/arch/arm/system.cc | 2 +-
src/arch/arm/utility.cc | 6 +-
src/arch/arm/vtophys.cc | 6 +-
src/arch/mips/linux/threadinfo.hh | 4 +-
src/arch/mips/process.cc | 8 ++--
src/arch/mips/stacktrace.cc | 12 ++----
src/arch/power/process.cc | 14 +++---
src/arch/sparc/process.cc | 26 ++++++------
src/arch/sparc/utility.cc | 4 +-
src/arch/sparc/vtophys.cc | 6 +-
src/arch/x86/bios/e820.cc | 16 ++++----
src/arch/x86/bios/e820.hh | 4 +-
src/arch/x86/bios/intelmp.cc | 58 ++++++++++++++--------------
src/arch/x86/bios/intelmp.hh | 22 +++++-----
src/arch/x86/bios/smbios.cc | 70 ++++++++++++++++++------------------
src/arch/x86/bios/smbios.hh | 8 ++--
src/arch/x86/linux/syscalls.cc | 6 +-
src/arch/x86/linux/system.cc | 13 ++----
src/arch/x86/process.cc | 24 ++++++------
src/arch/x86/stacktrace.cc | 26 +++++--------
src/arch/x86/system.cc | 41 ++++++++------------
src/base/loader/elf_object.cc | 2 +-
src/base/loader/elf_object.hh | 2 +-
src/base/loader/hex_file.cc | 4 +-
src/base/loader/hex_file.hh | 2 +-
src/base/loader/object_file.cc | 8 ++--
src/base/loader/object_file.hh | 4 +-
src/base/remote_gdb.cc | 17 ++++----
src/cpu/checker/thread_context.hh | 6 +-
src/cpu/inorder/thread_context.cc | 2 +-
src/cpu/inorder/thread_context.hh | 6 +-
src/cpu/o3/thread_context.hh | 6 +-
src/cpu/o3/thread_context_impl.hh | 2 +-
src/cpu/ozone/cpu.hh | 6 +-
src/cpu/simple_thread.hh | 8 ----
src/cpu/thread_context.hh | 12 +++---
src/cpu/thread_state.cc | 19 ++++-----
src/cpu/thread_state.hh | 13 ++----
src/dev/simple_disk.cc | 2 +-
src/kern/tru64/tru64.hh | 10 ++--
src/mem/fs_translating_port_proxy.cc | 18 +++-----
src/mem/se_translating_port_proxy.hh | 3 +-
src/sim/process.cc | 24 ++++++++---
src/sim/process.hh | 13 +++---
src/sim/process_impl.hh | 8 ++--
src/sim/syscall_emul.cc | 22 +++++-----
src/sim/syscall_emul.hh | 42 ++++++++++----------
src/sim/system.cc | 10 +----
src/sim/system.hh | 14 +++----
src/sim/vptr.hh | 4 +-
64 files changed, 376 insertions(+), 418 deletions(-)
diffs (truncated from 2727 to 300 lines):
diff -r 7e966326ef5b -r c744483edfcf src/arch/alpha/freebsd/system.cc
--- a/src/arch/alpha/freebsd/system.cc Fri Feb 24 11:43:53 2012 -0500
+++ b/src/arch/alpha/freebsd/system.cc Fri Feb 24 11:45:30 2012 -0500
@@ -76,8 +76,8 @@
ppc_vaddr = (Addr)tc->readIntReg(17);
timer_vaddr = (Addr)tc->readIntReg(18);
- virtProxy->write(ppc_vaddr, (uint32_t)SimClock::Frequency);
- virtProxy->write(timer_vaddr, (uint32_t)TIMER_FREQUENCY);
+ virtProxy.write(ppc_vaddr, (uint32_t)SimClock::Frequency);
+ virtProxy.write(timer_vaddr, (uint32_t)TIMER_FREQUENCY);
}
void
diff -r 7e966326ef5b -r c744483edfcf src/arch/alpha/linux/system.cc
--- a/src/arch/alpha/linux/system.cc Fri Feb 24 11:43:53 2012 -0500
+++ b/src/arch/alpha/linux/system.cc Fri Feb 24 11:45:30 2012 -0500
@@ -88,9 +88,9 @@
* Since we aren't using a bootloader, we have to copy the
* kernel arguments directly into the kernel's memory.
*/
- virtProxy->writeBlob(CommandLine(),
- (uint8_t*)params()->boot_osflags.c_str(),
- params()->boot_osflags.length()+1);
+ virtProxy.writeBlob(CommandLine(),
+ (uint8_t*)params()->boot_osflags.c_str(),
+ params()->boot_osflags.length()+1);
/**
* find the address of the est_cycle_freq variable and insert it
@@ -98,8 +98,8 @@
* calculated it by using the PIT, RTC, etc.
*/
if (kernelSymtab->findAddress("est_cycle_freq", addr))
- virtProxy->write(addr, (uint64_t)(SimClock::Frequency /
- params()->boot_cpu_frequency));
+ virtProxy.write(addr, (uint64_t)(SimClock::Frequency /
+ params()->boot_cpu_frequency));
/**
@@ -109,7 +109,7 @@
* 255 ASNs.
*/
if (kernelSymtab->findAddress("dp264_mv", addr))
- virtProxy->write(addr + 0x18, LittleEndianGuest::htog((uint32_t)127));
+ virtProxy.write(addr + 0x18, LittleEndianGuest::htog((uint32_t)127));
else
panic("could not find dp264_mv\n");
@@ -176,10 +176,8 @@
if (kernelSymtab->findAddress("loops_per_jiffy", addr)) {
Tick cpuFreq = tc->getCpuPtr()->frequency();
assert(intrFreq);
- FSTranslatingPortProxy* vp;
-
- vp = tc->getVirtProxy();
- vp->writeHtoG(addr, (uint32_t)((cpuFreq / intrFreq) * 0.9988));
+ FSTranslatingPortProxy &vp = tc->getVirtProxy();
+ vp.writeHtoG(addr, (uint32_t)((cpuFreq / intrFreq) * 0.9988));
}
}
diff -r 7e966326ef5b -r c744483edfcf src/arch/alpha/linux/threadinfo.hh
--- a/src/arch/alpha/linux/threadinfo.hh Fri Feb 24 11:43:53 2012 -0500
+++ b/src/arch/alpha/linux/threadinfo.hh Fri Feb 24 11:45:30 2012 -0500
@@ -78,8 +78,8 @@
if (!addr)
addr = tc->readMiscRegNoEffect(AlphaISA::IPR_PALtemp23);
- PortProxy* p = tc->getPhysProxy();
- p->readBlob(addr, (uint8_t *)&sp, sizeof(Addr));
+ PortProxy &p = tc->getPhysProxy();
+ p.readBlob(addr, (uint8_t *)&sp, sizeof(Addr));
return sp & ~ULL(0x3fff);
}
diff -r 7e966326ef5b -r c744483edfcf src/arch/alpha/process.cc
--- a/src/arch/alpha/process.cc Fri Feb 24 11:43:53 2012 -0500
+++ b/src/arch/alpha/process.cc Fri Feb 24 11:45:30 2012 -0500
@@ -144,16 +144,16 @@
else
panic("Unknown int size");
- initVirtMem->writeBlob(stack_min, (uint8_t*)&argc, intSize);
+ initVirtMem.writeBlob(stack_min, (uint8_t*)&argc, intSize);
copyStringArray(argv, argv_array_base, arg_data_base, initVirtMem);
copyStringArray(envp, envp_array_base, env_data_base, initVirtMem);
//Copy the aux stuff
for (vector<auxv_t>::size_type x = 0; x < auxv.size(); x++) {
- initVirtMem->writeBlob(auxv_array_base + x * 2 * intSize,
+ initVirtMem.writeBlob(auxv_array_base + x * 2 * intSize,
(uint8_t*)&(auxv[x].a_type), intSize);
- initVirtMem->writeBlob(auxv_array_base + (x * 2 + 1) * intSize,
+ initVirtMem.writeBlob(auxv_array_base + (x * 2 + 1) * intSize,
(uint8_t*)&(auxv[x].a_val), intSize);
}
diff -r 7e966326ef5b -r c744483edfcf src/arch/alpha/stacktrace.cc
--- a/src/arch/alpha/stacktrace.cc Fri Feb 24 11:43:53 2012 -0500
+++ b/src/arch/alpha/stacktrace.cc Fri Feb 24 11:45:30 2012 -0500
@@ -48,28 +48,28 @@
: tc(_tc)
{
Addr addr = 0;
- FSTranslatingPortProxy* vp = tc->getVirtProxy();
+ FSTranslatingPortProxy &vp = tc->getVirtProxy();
SymbolTable *symtab = tc->getSystemPtr()->kernelSymtab;
if (!symtab->findAddress("thread_info_size", addr))
panic("thread info not compiled into kernel\n");
- thread_info_size = vp->readGtoH<int32_t>(addr);
+ thread_info_size = vp.readGtoH<int32_t>(addr);
if (!symtab->findAddress("task_struct_size", addr))
panic("thread info not compiled into kernel\n");
- task_struct_size = vp->readGtoH<int32_t>(addr);
+ task_struct_size = vp.readGtoH<int32_t>(addr);
if (!symtab->findAddress("thread_info_task", addr))
panic("thread info not compiled into kernel\n");
- task_off = vp->readGtoH<int32_t>(addr);
+ task_off = vp.readGtoH<int32_t>(addr);
if (!symtab->findAddress("task_struct_pid", addr))
panic("thread info not compiled into kernel\n");
- pid_off = vp->readGtoH<int32_t>(addr);
+ pid_off = vp.readGtoH<int32_t>(addr);
if (!symtab->findAddress("task_struct_comm", addr))
panic("thread info not compiled into kernel\n");
- name_off = vp->readGtoH<int32_t>(addr);
+ name_off = vp.readGtoH<int32_t>(addr);
}
Addr
@@ -81,10 +81,8 @@
Addr tsk;
- FSTranslatingPortProxy* vp;
-
- vp = tc->getVirtProxy();
- tsk = vp->readGtoH<Addr>(base + task_off);
+ FSTranslatingPortProxy &vp = tc->getVirtProxy();
+ tsk = vp.readGtoH<Addr>(base + task_off);
return tsk;
}
@@ -98,10 +96,8 @@
uint16_t pd;
- FSTranslatingPortProxy* vp;
-
- vp = tc->getVirtProxy();
- pd = vp->readGtoH<uint16_t>(task + pid_off);
+ FSTranslatingPortProxy &vp = tc->getVirtProxy();
+ pd = vp.readGtoH<uint16_t>(task + pid_off);
return pd;
}
diff -r 7e966326ef5b -r c744483edfcf src/arch/alpha/system.cc
--- a/src/arch/alpha/system.cc Fri Feb 24 11:43:53 2012 -0500
+++ b/src/arch/alpha/system.cc Fri Feb 24 11:45:30 2012 -0500
@@ -119,8 +119,8 @@
* others do.)
*/
if (consoleSymtab->findAddress("env_booted_osflags", addr)) {
- virtProxy->writeBlob(addr, (uint8_t*)params()->boot_osflags.c_str(),
- strlen(params()->boot_osflags.c_str()));
+ virtProxy.writeBlob(addr, (uint8_t*)params()->boot_osflags.c_str(),
+ strlen(params()->boot_osflags.c_str()));
}
/**
@@ -130,9 +130,9 @@
if (consoleSymtab->findAddress("m5_rpb", addr)) {
uint64_t data;
data = htog(params()->system_type);
- virtProxy->write(addr+0x50, data);
+ virtProxy.write(addr+0x50, data);
data = htog(params()->system_rev);
- virtProxy->write(addr+0x58, data);
+ virtProxy.write(addr+0x58, data);
} else
panic("could not find hwrpb\n");
}
@@ -178,8 +178,8 @@
// lda gp,Y(gp): opcode 8, Ra = 29, rb = 29
const uint32_t gp_lda_pattern = (8 << 26) | (29 << 21) | (29 << 16);
- uint32_t i1 = virtProxy->read<uint32_t>(addr);
- uint32_t i2 = virtProxy->read<uint32_t>(addr + sizeof(MachInst));
+ uint32_t i1 = virtProxy.read<uint32_t>(addr);
+ uint32_t i2 = virtProxy.read<uint32_t>(addr + sizeof(MachInst));
if ((i1 & inst_mask) == gp_ldah_pattern &&
(i2 & inst_mask) == gp_lda_pattern) {
@@ -196,7 +196,7 @@
{
Addr addr = 0;
if (consoleSymtab->findAddress("m5AlphaAccess", addr)) {
- virtProxy->write(addr, htog(Phys2K0Seg(access)));
+ virtProxy.write(addr, htog(Phys2K0Seg(access)));
} else {
panic("could not find m5AlphaAccess\n");
}
diff -r 7e966326ef5b -r c744483edfcf src/arch/alpha/tru64/system.cc
--- a/src/arch/alpha/tru64/system.cc Fri Feb 24 11:43:53 2012 -0500
+++ b/src/arch/alpha/tru64/system.cc Fri Feb 24 11:45:30 2012 -0500
@@ -47,7 +47,7 @@
{
Addr addr = 0;
if (kernelSymtab->findAddress("enable_async_printf", addr)) {
- virtProxy->write(addr, (uint32_t)0);
+ virtProxy.write(addr, (uint32_t)0);
}
#ifdef DEBUG
diff -r 7e966326ef5b -r c744483edfcf src/arch/alpha/utility.cc
--- a/src/arch/alpha/utility.cc Fri Feb 24 11:43:53 2012 -0500
+++ b/src/arch/alpha/utility.cc Fri Feb 24 11:45:30 2012 -0500
@@ -52,9 +52,10 @@
return tc->readIntReg(16 + number);
} else {
Addr sp = tc->readIntReg(StackPointerReg);
- FSTranslatingPortProxy* vp = tc->getVirtProxy();
- uint64_t arg = vp->read<uint64_t>(sp +
- (number-NumArgumentRegs) * sizeof(uint64_t));
+ FSTranslatingPortProxy &vp = tc->getVirtProxy();
+ uint64_t arg = vp.read<uint64_t>(sp +
+ (number-NumArgumentRegs) *
+ sizeof(uint64_t));
return arg;
}
}
diff -r 7e966326ef5b -r c744483edfcf src/arch/alpha/vtophys.cc
--- a/src/arch/alpha/vtophys.cc Fri Feb 24 11:43:53 2012 -0500
+++ b/src/arch/alpha/vtophys.cc Fri Feb 24 11:45:30 2012 -0500
@@ -45,24 +45,24 @@
namespace AlphaISA {
PageTableEntry
-kernel_pte_lookup(PortProxy* mem, Addr ptbr, VAddr vaddr)
+kernel_pte_lookup(PortProxy &mem, Addr ptbr, VAddr vaddr)
{
Addr level1_pte = ptbr + vaddr.level1();
- PageTableEntry level1 = mem->read<uint64_t>(level1_pte);
+ PageTableEntry level1 = mem.read<uint64_t>(level1_pte);
if (!level1.valid()) {
DPRINTF(VtoPhys, "level 1 PTE not valid, va = %#\n", vaddr);
return 0;
}
Addr level2_pte = level1.paddr() + vaddr.level2();
- PageTableEntry level2 = mem->read<uint64_t>(level2_pte);
+ PageTableEntry level2 = mem.read<uint64_t>(level2_pte);
if (!level2.valid()) {
DPRINTF(VtoPhys, "level 2 PTE not valid, va = %#x\n", vaddr);
return 0;
}
Addr level3_pte = level2.paddr() + vaddr.level3();
- PageTableEntry level3 = mem->read<uint64_t>(level3_pte);
+ PageTableEntry level3 = mem.read<uint64_t>(level3_pte);
if (!level3.valid()) {
DPRINTF(VtoPhys, "level 3 PTE not valid, va = %#x\n", vaddr);
return 0;
diff -r 7e966326ef5b -r c744483edfcf src/arch/alpha/vtophys.hh
--- a/src/arch/alpha/vtophys.hh Fri Feb 24 11:43:53 2012 -0500
+++ b/src/arch/alpha/vtophys.hh Fri Feb 24 11:45:30 2012 -0500
@@ -41,7 +41,7 @@
namespace AlphaISA {
-PageTableEntry kernel_pte_lookup(PortProxy* mem, Addr ptbr,
+PageTableEntry kernel_pte_lookup(PortProxy &mem, Addr ptbr,
VAddr vaddr);
Addr vtophys(Addr vaddr);
diff -r 7e966326ef5b -r c744483edfcf src/arch/arm/linux/process.cc
--- a/src/arch/arm/linux/process.cc Fri Feb 24 11:43:53 2012 -0500
+++ b/src/arch/arm/linux/process.cc Fri Feb 24 11:45:30 2012 -0500
@@ -452,7 +452,7 @@
int index = 0;
uint32_t tlsPtr = process->getSyscallArg(tc, index);
- tc->getMemProxy()->writeBlob(ArmLinuxProcess::commPage + 0x0ff0,
+ tc->getMemProxy().writeBlob(ArmLinuxProcess::commPage + 0x0ff0,
(uint8_t *)&tlsPtr, sizeof(tlsPtr));
tc->setMiscReg(MISCREG_TPIDRURO,tlsPtr);
return 0;
@@ -512,7 +512,7 @@
// Fill this page with swi -1 so we'll no if we land in it somewhere.
for (Addr addr = 0; addr < PageBytes; addr += sizeof(swiNeg1)) {
- tc->getMemProxy()->writeBlob(commPage + addr,
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
