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

Merge saidi@zizzer.eecs.umich.edu:/bk/m5

Browse source 
into ali-saidis-computer.local:/research/m5

--HG--
extra : convert_revision : 0b97ac6ae704e47023bb9db9694004022c548b4f
This commit is contained in:
Ali Saidi 2004-10-17 22:32:17 -05:00
commit b5a71e5e52
6 changed files with 35 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/alpha/vtophys.cc
View file

@ -109,7 +109,7 @@ vtophys(ExecContext *xc, Addr vaddr)
Addr pte = kernel_pte_lookup(xc->physmem, ptbr, vaddr); Addr pte = kernel_pte_lookup(xc->physmem, ptbr, vaddr);
uint64_t entry = xc->physmem->phys_read_qword(pte); uint64_t entry = xc->physmem->phys_read_qword(pte);
if (pte && entry_valid(entry)) if (pte && entry_valid(entry))
paddr = PMAP_PTE_PA(entry) | (vaddr & PGOFSET); paddr = PMAP_PTE_PA(entry) | (vaddr & ALPHA_PGOFSET);
} }
} }
@ -141,7 +141,7 @@ CopyOut(ExecContext *xc, void *dest, Addr src, size_t cplen)
int len; int len;
paddr = vtophys(xc, src); paddr = vtophys(xc, src);
len = min((int)(ALPHA_PGBYTES - (paddr & PGOFSET)), (int)cplen); len = min((int)(ALPHA_PGBYTES - (paddr & ALPHA_PGOFSET)), (int)cplen);
dmaaddr = (char *)xc->physmem->dma_addr(paddr, len); dmaaddr = (char *)xc->physmem->dma_addr(paddr, len);
assert(dmaaddr); assert(dmaaddr);
@ -182,7 +182,7 @@ CopyIn(ExecContext *xc, Addr dest, void *source, size_t cplen)
int len; int len;
paddr = vtophys(xc, dest); paddr = vtophys(xc, dest);
len = min((int)(ALPHA_PGBYTES - (paddr & PGOFSET)), (int)cplen); len = min((int)(ALPHA_PGBYTES - (paddr & ALPHA_PGOFSET)), (int)cplen);
dmaaddr = (char *)xc->physmem->dma_addr(paddr, len); dmaaddr = (char *)xc->physmem->dma_addr(paddr, len);
assert(dmaaddr); assert(dmaaddr);
@ -222,7 +222,7 @@ CopyString(ExecContext *xc, char *dst, Addr vaddr, size_t maxlen)
int len; int len;
paddr = vtophys(xc, vaddr); paddr = vtophys(xc, vaddr);
len = min((int)(ALPHA_PGBYTES - (paddr & PGOFSET)), (int)maxlen); len = min((int)(ALPHA_PGBYTES - (paddr & ALPHA_PGOFSET)), (int)maxlen);
dmaaddr = (char *)xc->physmem->dma_addr(paddr, len); dmaaddr = (char *)xc->physmem->dma_addr(paddr, len);
assert(dmaaddr); assert(dmaaddr);

13
base/callback.hh
View file

@ -103,4 +103,17 @@ class CallbackQueue
} }
}; };
template <class T, void (T::* F)()>
class MakeCallback : public Callback
{
private:
T *object;
public:
MakeCallback(T *o)
: object(o)
{ }
void process() { (object->*F)(); }
};
#endif // __CALLBACK_HH__ #endif // __CALLBACK_HH__

2
base/intmath.hh
View file

@ -120,7 +120,7 @@ FloorLog2(int64_t x)
} }
#if defined(__APPLE__) #if defined(__APPLE__)
int inline int
FloorLog2(size_t x) FloorLog2(size_t x)
{ {
assert(x > 0); assert(x > 0);

28
dev/pcidev.cc
View file

@ -129,7 +129,7 @@ PciDev::WriteConfig(int offset, int size, uint32_t data)
case PCI0_INTERRUPT_LINE: case PCI0_INTERRUPT_LINE:
case PCI_CACHE_LINE_SIZE: case PCI_CACHE_LINE_SIZE:
case PCI_LATENCY_TIMER: case PCI_LATENCY_TIMER:
*(uint8_t *)&config.data[offset] = byte_value; *(uint8_t *)&config.data[offset] = htoa(byte_value);
break; break;
default: default:
@ -142,7 +142,7 @@ PciDev::WriteConfig(int offset, int size, uint32_t data)
case PCI_COMMAND: case PCI_COMMAND:
case PCI_STATUS: case PCI_STATUS:
case PCI_CACHE_LINE_SIZE: case PCI_CACHE_LINE_SIZE:
*(uint16_t *)&config.data[offset] = half_value; *(uint16_t *)&config.data[offset] = htoa(half_value);
break; break;
default: default:
@ -166,21 +166,21 @@ PciDev::WriteConfig(int offset, int size, uint32_t data)
// to size of memory it needs // to size of memory it needs
if (word_value == 0xffffffff) { if (word_value == 0xffffffff) {
// This is I/O Space, bottom two bits are read only // This is I/O Space, bottom two bits are read only
if (config.data[offset] & 0x1) { if (htoa(config.data[offset]) & 0x1) {
*(uint32_t *)&config.data[offset] = *(uint32_t *)&config.data[offset] = htoa(
~(BARSize[barnum] - 1) | ~(BARSize[barnum] - 1) |
(config.data[offset] & 0x3); (htoa(config.data[offset]) & 0x3));
} else { } else {
// This is memory space, bottom four bits are read only // This is memory space, bottom four bits are read only
*(uint32_t *)&config.data[offset] = *(uint32_t *)&config.data[offset] = htoa(
~(BARSize[barnum] - 1) | ~(BARSize[barnum] - 1) |
(config.data[offset] & 0xF); (htoa(config.data[offset]) & 0xF));
} }
} else { } else {
// This is I/O Space, bottom two bits are read only // This is I/O Space, bottom two bits are read only
if(config.data[offset] & 0x1) { if(htoa(config.data[offset]) & 0x1) {
*(uint32_t *)&config.data[offset] = (word_value & ~0x3) | *(uint32_t *)&config.data[offset] = htoa((word_value & ~0x3) |
(config.data[offset] & 0x3); (htoa(config.data[offset]) & 0x3));
if (word_value & ~0x1) { if (word_value & ~0x1) {
Addr base_addr = (word_value & ~0x1) + TSUNAMI_PCI0_IO; Addr base_addr = (word_value & ~0x1) + TSUNAMI_PCI0_IO;
@ -205,8 +205,8 @@ PciDev::WriteConfig(int offset, int size, uint32_t data)
} else { } else {
// This is memory space, bottom four bits are read only // This is memory space, bottom four bits are read only
*(uint32_t *)&config.data[offset] = (word_value & ~0xF) | *(uint32_t *)&config.data[offset] = htoa((word_value & ~0xF) |
(config.data[offset] & 0xF); (htoa(config.data[offset]) & 0xF));
if (word_value & ~0x3) { if (word_value & ~0x3) {
Addr base_addr = (word_value & ~0x3) + Addr base_addr = (word_value & ~0x3) +
@ -238,14 +238,14 @@ PciDev::WriteConfig(int offset, int size, uint32_t data)
if (word_value == 0xfffffffe) if (word_value == 0xfffffffe)
*(uint32_t *)&config.data[offset] = 0xffffffff; *(uint32_t *)&config.data[offset] = 0xffffffff;
else else
*(uint32_t *)&config.data[offset] = word_value; *(uint32_t *)&config.data[offset] = htoa(word_value);
break; break;
case PCI_COMMAND: case PCI_COMMAND:
// This could also clear some of the error bits in the Status // This could also clear some of the error bits in the Status
// register. However they should never get set, so lets ignore // register. However they should never get set, so lets ignore
// it for now // it for now
*(uint16_t *)&config.data[offset] = half_value; *(uint16_t *)&config.data[offset] = htoa(half_value);
break; break;
default: default:

2
dev/uart.cc
View file

@ -287,7 +287,7 @@ Uart::write(MemReqPtr &req, const uint8_t *data)
switch (daddr) { switch (daddr) {
case 0x0: case 0x0:
if (!(LCR & 0x80)) { // write byte if (!(LCR & 0x80)) { // write byte
cons->out(*(uint64_t *)data); cons->out(*(uint8_t *)data);
platform->clearConsoleInt(); platform->clearConsoleInt();
status &= ~TX_INT; status &= ~TX_INT;
if (UART_IER_THRI & IER) if (UART_IER_THRI & IER)

4
sim/system.cc
View file

@ -156,8 +156,8 @@ System::System(Params *p)
if (!hwrpb) if (!hwrpb)
panic("could not translate hwrpb addr\n"); panic("could not translate hwrpb addr\n");
*(uint64_t*)(hwrpb+0x50) = params->system_type; *(uint64_t*)(hwrpb+0x50) = htoa(params->system_type);
*(uint64_t*)(hwrpb+0x58) = params->system_rev; *(uint64_t*)(hwrpb+0x58) = htoa(params->system_rev);
} else } else
panic("could not find hwrpb\n"); panic("could not find hwrpb\n");