From 5365c18f2e309b54d3e37dc98d8cca20ec9d4219 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 2 May 2019 02:16:33 -0700 Subject: arch, base, cpu, gpu, sim: Merge getMemProxy and getVirtProxy. These two functions were performing the same function but had two different names for historical reasons. This change merges them together, keeping the getVirtProxy name to be consistent with the getPhysProxy method used to get a non-translating proxy port. Change-Id: Idd83c6b899f9343795075b030ccbc723a79e52a4 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/18581 Tested-by: kokoro Reviewed-by: Andreas Sandberg Reviewed-by: Jason Lowe-Power Maintainer: Andreas Sandberg --- src/arch/x86/linux/process.cc | 12 ++++++------ src/arch/x86/pseudo_inst.cc | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/arch/x86') diff --git a/src/arch/x86/linux/process.cc b/src/arch/x86/linux/process.cc index 1d8bcbf6c..8a58ee1fe 100644 --- a/src/arch/x86/linux/process.cc +++ b/src/arch/x86/linux/process.cc @@ -103,7 +103,7 @@ unameFunc(SyscallDesc *desc, int callnum, ThreadContext *tc) strcpy(name->version, "#1 Mon Aug 18 11:32:15 EDT 2003"); strcpy(name->machine, "x86_64"); - name.copyOut(tc->getMemProxy()); + name.copyOut(tc->getVirtProxy()); return 0; } @@ -125,7 +125,7 @@ archPrctlFunc(SyscallDesc *desc, int callnum, ThreadContext *tc) int code = process->getSyscallArg(tc, index); uint64_t addr = process->getSyscallArg(tc, index); uint64_t fsBase, gsBase; - PortProxy &p = tc->getMemProxy(); + PortProxy &p = tc->getVirtProxy(); switch(code) { // Each of these valid options should actually check addr. @@ -194,10 +194,10 @@ setThreadArea32Func(SyscallDesc *desc, int callnum, ThreadContext *tc) gdt(x86p->gdtStart() + minTLSEntry * sizeof(uint64_t), numTLSEntries * sizeof(uint64_t)); - if (!userDesc.copyIn(tc->getMemProxy())) + if (!userDesc.copyIn(tc->getVirtProxy())) return -EFAULT; - if (!gdt.copyIn(tc->getMemProxy())) + if (!gdt.copyIn(tc->getVirtProxy())) panic("Failed to copy in GDT for %s.\n", desc->name()); if (userDesc->entry_number == (uint32_t)(-1)) { @@ -249,9 +249,9 @@ setThreadArea32Func(SyscallDesc *desc, int callnum, ThreadContext *tc) gdt[index] = (uint64_t)segDesc; - if (!userDesc.copyOut(tc->getMemProxy())) + if (!userDesc.copyOut(tc->getVirtProxy())) return -EFAULT; - if (!gdt.copyOut(tc->getMemProxy())) + if (!gdt.copyOut(tc->getVirtProxy())) panic("Failed to copy out GDT for %s.\n", desc->name()); return 0; diff --git a/src/arch/x86/pseudo_inst.cc b/src/arch/x86/pseudo_inst.cc index 253c91441..6c1a7f8bf 100644 --- a/src/arch/x86/pseudo_inst.cc +++ b/src/arch/x86/pseudo_inst.cc @@ -68,7 +68,7 @@ m5PageFault(ThreadContext *tc) Process *p = tc->getProcessPtr(); if (!p->fixupStackFault(tc->readMiscReg(MISCREG_CR2))) { - PortProxy &proxy = tc->getMemProxy(); + PortProxy &proxy = tc->getVirtProxy(); // at this point we should have 6 values on the interrupt stack int size = 6; uint64_t is[size]; -- cgit v1.2.3