sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge zizzer.eecs.umich.edu:/bk/newmem

Browse source 
into  vm1.(none):/home/stever/bk/newmem-head

--HG--
extra : convert_revision : c2350e01a052114a264f26551b13fca03a835c61
This commit is contained in:
Steve Reinhardt 2007-02-07 10:55:14 -08:00
commit 6b37bb6710
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mem/cache/cache_impl.hh vendored
View file

@ -342,8 +342,8 @@ Cache<TagStore,Coherence>::handleFill(BlkType *blk, MSHR * mshr,
target->getPtr<uint8_t>(), target->getSize()); target->getPtr<uint8_t>(), target->getSize());
} }
} else { } else {
if (pkt->req->isLocked()) { if (target->req->isLocked()) {
blk->trackLoadLocked(pkt->req); blk->trackLoadLocked(target->req);
} }
std::memcpy(target->getPtr<uint8_t>(), std::memcpy(target->getPtr<uint8_t>(),
blk->data + target->getOffset(blkSize), blk->data + target->getOffset(blkSize),

1
src/mem/packet.hh
View file

@ -42,6 +42,7 @@
#include <list> #include <list>
#include <bitset> #include <bitset>
#include "base/compiler.hh"
#include "base/misc.hh" #include "base/misc.hh"
#include "mem/request.hh" #include "mem/request.hh"
#include "sim/host.hh" #include "sim/host.hh"

2
src/unittest/cprintftest.cc
View file

@ -40,7 +40,7 @@ using namespace std;
int int
main() main()
{ {
char foo[9]; char foo[] = "foo";
cprintf("%s\n", foo); cprintf("%s\n", foo);
cprintf("%d\n", 'A'); cprintf("%d\n", 'A');