From d96de69abc02b40e1dec4843a7a7b7e30749f4fa Mon Sep 17 00:00:00 2001 From: Ron Dreslinski Date: Mon, 20 Feb 2006 23:26:39 -0500 Subject: Add in a new translating port that allows syscalls to translate addresses via the page table before accessing the memory port. Other compile issues cleaned up. SConscript: Changes to compile the new Translating Port. Split out memtester and eio support, will rework them back in after first getting a simpleCPU to work arch/alpha/alpha_linux_process.cc: arch/alpha/alpha_tru64_process.cc: sim/syscall_emul.cc: sim/syscall_emul.hh: Changes to use the new translating Port. cpu/exec_context.cc: cpu/exec_context.hh: Create a translating port in each execution context. sim/process.cc: Fix the way we do proxy memory --HG-- extra : convert_revision : 3d33218fe8b425a5d9ce24757f1112b4aa6001fd --- mem/translating_port.cc | 119 ++++++++++++++++++++++++++++++++++++++++++++++++ mem/translating_port.hh | 59 ++++++++++++++++++++++++ 2 files changed, 178 insertions(+) create mode 100644 mem/translating_port.cc create mode 100644 mem/translating_port.hh (limited to 'mem') diff --git a/mem/translating_port.cc b/mem/translating_port.cc new file mode 100644 index 000000000..11004769e --- /dev/null +++ b/mem/translating_port.cc @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2001-2005 The Regents of The University of Michigan + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer; + * redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution; + * neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include "mem/port.hh" +#include "mem/translating_port.hh" +#include "mem/page_table.hh" + +TranslatingPort::TranslatingPort(Port *_port, PageTable *p_table) + : port(_port), pTable(p_table) +{ } + +TranslatingPort::~TranslatingPort() +{ } + +Fault +TranslatingPort::readBlobFunctional(Addr addr, uint8_t *p, int size) +{ + Addr paddr; + + //@todo Break up things larger than a page size + pTable->page_check(addr, size); + + + if (!pTable->translate(addr,paddr)) + return Machine_Check_Fault; + + port->readBlobFunctional(paddr, p, size); + return No_Fault; +} + +Fault +TranslatingPort::writeBlobFunctional(Addr addr, const uint8_t *p, int size) +{ + Addr paddr; + + //@todo Break up things larger than a page size + pTable->page_check(addr, size); + + if (!pTable->translate(addr,paddr)) + return Machine_Check_Fault; + + port->writeBlobFunctional(paddr, p, size); + return No_Fault; +} + +Fault +TranslatingPort::memsetBlobFunctional(Addr addr, uint8_t val, int size) +{ + Addr paddr; + + //@todo Break up things larger than a page size + pTable->page_check(addr, size); + + if (!pTable->translate(addr,paddr)) + return Machine_Check_Fault; + + port->memsetBlobFunctional(paddr, val, size); + return No_Fault; +} + +Fault +TranslatingPort::writeStringFunctional(Addr addr, const char *str) +{ + //@todo Break up things larger than a page size + //pTable->page_check(addr, size); + //Need to check string length??? + + Addr paddr; + + if (!pTable->translate(addr,paddr)) + return Machine_Check_Fault; + + port->writeStringFunctional(paddr, str); + return No_Fault; +} + +Fault +TranslatingPort::readStringFunctional(std::string &str, Addr addr) +{ + //@todo Break up things larger than a page size + //pTable->page_check(addr, size); + //Need to check string length??? + + Addr paddr; + + if (!pTable->translate(addr,paddr)) + return Machine_Check_Fault; + + //@todo Break this up into readBlobs + port->readStringFunctional(str, paddr); + return No_Fault; +} + diff --git a/mem/translating_port.hh b/mem/translating_port.hh new file mode 100644 index 000000000..20140d26a --- /dev/null +++ b/mem/translating_port.hh @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2001-2005 The Regents of The University of Michigan + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer; + * redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution; + * neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __MEM_TRANSLATING_PROT_HH__ +#define __MEM_TRANSLATING_PROT_HH__ + +#include "mem/memory.hh" + +class Port; +class PageTable; + +class TranslatingPort +{ + private: + Port *port; + PageTable *pTable; + + TranslatingPort(const TranslatingPort &specmem); + const TranslatingPort &operator=(const TranslatingPort &specmem); + + public: + TranslatingPort(Port *_port, PageTable *p_table); + virtual ~TranslatingPort(); + + public: + Fault readBlobFunctional(Addr addr, uint8_t *p, int size); + Fault writeBlobFunctional(Addr addr, const uint8_t *p, int size); + Fault memsetBlobFunctional(Addr addr, uint8_t val, int size); + Fault writeStringFunctional(Addr addr, const char *str); + Fault readStringFunctional(std::string &str, Addr addr); + +}; + +#endif -- cgit v1.2.3