diff options
| author | Andreas Sandberg <andreas.sandberg@arm.com> | 2016-01-29 12:14:21 +0000 |
|---|---|---|
| committer | Andreas Sandberg <andreas.sandberg@arm.com> | 2016-01-29 12:14:21 +0000 |
| commit | b99fea78a6b0db9dcf7133c302991b8a7a8f8538 (patch) | |
| tree | d92f89fbd5a03e9ce64ab74009687c1b8ec4f441 /ext/nomali/lib/mmu.hh | |
| parent | 1285d639eba6b95e31fb2b4aacae524d04ddf981 (diff) | |
| download | gem5-b99fea78a6b0db9dcf7133c302991b8a7a8f8538.tar.xz | |
ext: Update NoMali to external rev f08e0a5
Update NoMali from external revision 9adf9d6 to f08e0a5 and bring in
the following changes:
f08e0a5 Add support for tracking address space state
f11099e Fix job slot register handling when running new jobs
b28c98e api: Add a reset callback
29ac4c3 tests: Update gitignore to cover all future test cases
1c6b893 Propagate reset calls to all job slots
8f8ec15 Remove redundant reg vector in MMU
85d90d2 tests: Fix incorrect extern declaration
Diffstat (limited to 'ext/nomali/lib/mmu.hh')
| -rw-r--r-- | ext/nomali/lib/mmu.hh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ext/nomali/lib/mmu.hh b/ext/nomali/lib/mmu.hh index 82864a6ff..f0381d442 100644 --- a/ext/nomali/lib/mmu.hh +++ b/ext/nomali/lib/mmu.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 ARM Limited + * Copyright (c) 2014-2016 ARM Limited * All rights reserved * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,6 +23,7 @@ #include <vector> #include "gpublock.hh" +#include "addrspace.hh" #include "types.hh" namespace NoMali { @@ -44,12 +45,19 @@ class MMU MMU(GPU &_gpu); virtual ~MMU(); + void reset() override; + + uint32_t readReg(RegAddr idx) override; void writeReg(RegAddr idx, uint32_t value) override; + uint32_t readRegRaw(RegAddr idx) override; + void writeRegRaw(RegAddr idx, uint32_t value) override; + protected: void onInterrupt(int set) override; - RegVector regs; + /** Address spaces belonging to this MMU block */ + std::vector<AddrSpace> spaces; }; } |