/*
- * Copyright (c) 2011-2013 ARM Limited
+ * Copyright (c) 2011-2013, 2018 ARM Limited
* All rights reserved
*
* The license below extends only to copyright in the software and shall
#define __MEM_PORT_PROXY_HH__
#include "config/the_isa.hh"
-#if THE_ISA != NO_ISA
+#if THE_ISA != NULL_ISA
#include "arch/isa_traits.hh"
#endif
/** Granularity of any transactions issued through this proxy. */
const unsigned int _cacheLineSize;
- void blobHelper(Addr addr, uint8_t *p, int size, MemCmd cmd) const;
-
public:
PortProxy(MasterPort &port, unsigned int cacheLineSize) :
_port(port), _cacheLineSize(cacheLineSize) { }
/**
* Read size bytes memory at address and store in p.
*/
- virtual void readBlob(Addr addr, uint8_t* p, int size) const
- { blobHelper(addr, p, size, MemCmd::ReadReq); }
+ virtual void readBlob(Addr addr, uint8_t* p, int size) const {
+ readBlobPhys(addr, 0, p, size);
+ }
/**
* Write size bytes from p to address.
*/
- virtual void writeBlob(Addr addr, uint8_t* p, int size) const
- { blobHelper(addr, p, size, MemCmd::WriteReq); }
+ virtual void writeBlob(Addr addr, const uint8_t* p, int size) const {
+ writeBlobPhys(addr, 0, p, size);
+ }
/**
* Fill size bytes starting at addr with byte value val.
*/
- virtual void memsetBlob(Addr addr, uint8_t v, int size) const;
+ virtual void memsetBlob(Addr addr, uint8_t v, int size) const {
+ memsetBlobPhys(addr, 0, v, size);
+ }
+
+ /**
+ * Read size bytes memory at physical address and store in p.
+ */
+ void readBlobPhys(Addr addr, Request::Flags flags,
+ uint8_t* p, int size) const;
+
+ /**
+ * Write size bytes from p to physical address.
+ */
+ void writeBlobPhys(Addr addr, Request::Flags flags,
+ const uint8_t* p, int size) const;
+
+ /**
+ * Fill size bytes starting at physical addr with byte value val.
+ */
+ void memsetBlobPhys(Addr addr, Request::Flags flags,
+ uint8_t v, int size) const;
/**
* Read sizeof(T) bytes from address and return as object T.
template <typename T>
void write(Addr address, T data) const;
-#if THE_ISA != NO_ISA
+ /**
+ * Read sizeof(T) bytes from address and return as object T.
+ * Performs selected endianness transform.
+ */
+ template <typename T>
+ T readGtoH(Addr address, ByteOrder guest_byte_order) const;
+
+ /**
+ * Write object T to address. Writes sizeof(T) bytes.
+ * Performs selected endianness transform.
+ */
+ template <typename T>
+ void writeHtoG(Addr address, T data, ByteOrder guest_byte_order) const;
+
+#if THE_ISA != NULL_ISA
/**
* Read sizeof(T) bytes from address and return as object T.
* Performs Guest to Host endianness transform.
};
+/**
+ * This object is a proxy for a structural port, to be used for debug
+ * accesses to secure memory.
+ *
+ * The addresses are interpreted as physical addresses to secure memory.
+ */
+class SecurePortProxy : public PortProxy
+{
+ public:
+ SecurePortProxy(MasterPort &port, unsigned int cache_line_size)
+ : PortProxy(port, cache_line_size) {}
+
+ void readBlob(Addr addr, uint8_t *p, int size) const override;
+ void writeBlob(Addr addr, const uint8_t *p, int size) const override;
+ void memsetBlob(Addr addr, uint8_t val, int size) const override;
+};
+
template <typename T>
T
PortProxy::read(Addr address) const
writeBlob(address, (uint8_t*)&data, sizeof(T));
}
-#if THE_ISA != NO_ISA
+template <typename T>
+T
+PortProxy::readGtoH(Addr address, ByteOrder byte_order) const
+{
+ T data;
+ readBlob(address, (uint8_t*)&data, sizeof(T));
+ return gtoh(data, byte_order);
+}
+
+template <typename T>
+void
+PortProxy::writeHtoG(Addr address, T data, ByteOrder byte_order) const
+{
+ data = htog(data, byte_order);
+ writeBlob(address, (uint8_t*)&data, sizeof(T));
+}
+
+#if THE_ISA != NULL_ISA
template <typename T>
T
PortProxy::readGtoH(Addr address) const