diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2012-01-16 04:27:10 -0800 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2012-01-16 04:27:10 -0800 |
| commit | da2a4acc26ba264c3c4a12495776fd6a1c4fb133 (patch) | |
| tree | f142100388b9d1403492c97b0d323728ce18ef8a /src/dev | |
| parent | 241cc0c8402f1b9f2ec20d1cc152d96930959b2a (diff) | |
| parent | a7394ad6807bd5e85f680184bf308673ca00534a (diff) | |
| download | gem5-da2a4acc26ba264c3c4a12495776fd6a1c4fb133.tar.xz | |
Merge yet again with the main repository.
Diffstat (limited to 'src/dev')
| -rw-r--r-- | src/dev/arm/pl111.cc | 2 | ||||
| -rw-r--r-- | src/dev/io_device.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dev/arm/pl111.cc b/src/dev/arm/pl111.cc index e13045338..958f07aa7 100644 --- a/src/dev/arm/pl111.cc +++ b/src/dev/arm/pl111.cc @@ -67,7 +67,7 @@ Pl111::Pl111(const Params *p) { pioSize = 0xFFFF; - pic = simout.create("framebuffer.bmp", true); + pic = simout.create(csprintf("%s.framebuffer.bmp", sys->name()), true); dmaBuffer = new uint8_t[LcdMaxWidth * LcdMaxHeight * sizeof(uint32_t)]; diff --git a/src/dev/io_device.cc b/src/dev/io_device.cc index f124767ca..0ad53f09e 100644 --- a/src/dev/io_device.cc +++ b/src/dev/io_device.cc @@ -71,7 +71,7 @@ void PioDevice::init() { if (!pioPort) - panic("Pio port %s not connected to anything!", name()); + panic("Pio port of %s not connected to anything!", name()); pioPort->sendStatusChange(Port::RangeChange); } |