successful merge, linux still builds and runs as far it used to, network device still transmit ARP packet.
arch/alpha/alpha_memory.cc: change to the main m5 tree convention for naming base/traceflags.py: add ide and pciconfigall traceflags kern/linux/linux_system.cc: kern/linux/linux_system.hh: kill some old binning styled stuff --HG-- extra : convert_revision : 0558878906817975a714b1c7c08f9ee405468535
This commit is contained in:
parent
a5f90eba3b
commit
16800971d0
4 changed files with 29 additions and 460 deletions
|
@ -44,6 +44,11 @@ using namespace std;
|
||||||
//
|
//
|
||||||
// Alpha TLB
|
// Alpha TLB
|
||||||
//
|
//
|
||||||
|
#ifdef DEBUG
|
||||||
|
bool uncacheBit39 = false;
|
||||||
|
bool uncacheBit40 = false;
|
||||||
|
#endif
|
||||||
|
|
||||||
AlphaTLB::AlphaTLB(const string &name, int s)
|
AlphaTLB::AlphaTLB(const string &name, int s)
|
||||||
: SimObject(name), size(s), nlu(0)
|
: SimObject(name), size(s), nlu(0)
|
||||||
{
|
{
|
||||||
|
@ -317,7 +322,7 @@ AlphaITB::translate(MemReqPtr &req) const
|
||||||
if (ICM_CM(ipr[AlphaISA::IPR_ICM]) != AlphaISA::mode_kernel) {
|
if (ICM_CM(ipr[AlphaISA::IPR_ICM]) != AlphaISA::mode_kernel) {
|
||||||
fault(req->vaddr, req->xc);
|
fault(req->vaddr, req->xc);
|
||||||
acv++;
|
acv++;
|
||||||
return Itb_Acv_Fault;
|
return ITB_Acv_Fault;
|
||||||
}
|
}
|
||||||
|
|
||||||
req->paddr = req->vaddr & PA_IMPL_MASK;
|
req->paddr = req->vaddr & PA_IMPL_MASK;
|
||||||
|
@ -337,7 +342,7 @@ AlphaITB::translate(MemReqPtr &req) const
|
||||||
if (!pte) {
|
if (!pte) {
|
||||||
fault(req->vaddr, req->xc);
|
fault(req->vaddr, req->xc);
|
||||||
misses++;
|
misses++;
|
||||||
return Itb_Fault_Fault;
|
return ITB_Fault_Fault;
|
||||||
}
|
}
|
||||||
|
|
||||||
req->paddr = PA_PFN2PA(pte->ppn) + VA_POFS(req->vaddr & ~3);
|
req->paddr = PA_PFN2PA(pte->ppn) + VA_POFS(req->vaddr & ~3);
|
||||||
|
@ -347,7 +352,7 @@ AlphaITB::translate(MemReqPtr &req) const
|
||||||
// instruction access fault
|
// instruction access fault
|
||||||
fault(req->vaddr, req->xc);
|
fault(req->vaddr, req->xc);
|
||||||
acv++;
|
acv++;
|
||||||
return Itb_Acv_Fault;
|
return ITB_Acv_Fault;
|
||||||
}
|
}
|
||||||
|
|
||||||
hits++;
|
hits++;
|
||||||
|
@ -506,7 +511,7 @@ AlphaDTB::translate(MemReqPtr &req, bool write) const
|
||||||
((write ? MM_STAT_WR_MASK : 0) | MM_STAT_ACV_MASK),
|
((write ? MM_STAT_WR_MASK : 0) | MM_STAT_ACV_MASK),
|
||||||
req->xc);
|
req->xc);
|
||||||
if (write) { write_acv++; } else { read_acv++; }
|
if (write) { write_acv++; } else { read_acv++; }
|
||||||
return Dtb_Acv_Fault;
|
return DTB_Acv_Fault;
|
||||||
}
|
}
|
||||||
|
|
||||||
req->paddr = req->vaddr & PA_IMPL_MASK;
|
req->paddr = req->vaddr & PA_IMPL_MASK;
|
||||||
|
@ -546,13 +551,13 @@ AlphaDTB::translate(MemReqPtr &req, bool write) const
|
||||||
(pte->fonw ? MM_STAT_FONW_MASK : 0),
|
(pte->fonw ? MM_STAT_FONW_MASK : 0),
|
||||||
req->xc);
|
req->xc);
|
||||||
write_acv++;
|
write_acv++;
|
||||||
return Dtb_Fault_Fault;
|
return DTB_Fault_Fault;
|
||||||
}
|
}
|
||||||
if (pte->fonw) {
|
if (pte->fonw) {
|
||||||
fault(req->vaddr, MM_STAT_WR_MASK | MM_STAT_FONW_MASK,
|
fault(req->vaddr, MM_STAT_WR_MASK | MM_STAT_FONW_MASK,
|
||||||
req->xc);
|
req->xc);
|
||||||
write_acv++;
|
write_acv++;
|
||||||
return Dtb_Fault_Fault;
|
return DTB_Fault_Fault;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (!(pte->xre & MODE2MASK(mode))) {
|
if (!(pte->xre & MODE2MASK(mode))) {
|
||||||
|
@ -561,12 +566,12 @@ AlphaDTB::translate(MemReqPtr &req, bool write) const
|
||||||
(pte->fonr ? MM_STAT_FONR_MASK : 0),
|
(pte->fonr ? MM_STAT_FONR_MASK : 0),
|
||||||
req->xc);
|
req->xc);
|
||||||
read_acv++;
|
read_acv++;
|
||||||
return Dtb_Acv_Fault;
|
return DTB_Acv_Fault;
|
||||||
}
|
}
|
||||||
if (pte->fonr) {
|
if (pte->fonr) {
|
||||||
fault(req->vaddr, MM_STAT_FONR_MASK, req->xc);
|
fault(req->vaddr, MM_STAT_FONR_MASK, req->xc);
|
||||||
read_acv++;
|
read_acv++;
|
||||||
return Dtb_Fault_Fault;
|
return DTB_Fault_Fault;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,6 +57,7 @@ baseFlags = [
|
||||||
'Mbox',
|
'Mbox',
|
||||||
'PCIA',
|
'PCIA',
|
||||||
'PCIDEV',
|
'PCIDEV',
|
||||||
|
'PciConfigAll',
|
||||||
'ISP',
|
'ISP',
|
||||||
'BADADDR',
|
'BADADDR',
|
||||||
'Console',
|
'Console',
|
||||||
|
@ -103,7 +104,11 @@ baseFlags = [
|
||||||
'Context',
|
'Context',
|
||||||
'Config',
|
'Config',
|
||||||
'Sampler',
|
'Sampler',
|
||||||
'WriteBarrier'
|
'WriteBarrier',
|
||||||
|
'IdeCtrl',
|
||||||
|
'IdeDisk',
|
||||||
|
'Tsunami',
|
||||||
|
'TsunamiUart'
|
||||||
]
|
]
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -118,7 +123,8 @@ compoundFlagMap = {
|
||||||
'GDBAll' : [ 'GDBMisc', 'GDBAcc', 'GDBRead', 'GDBWrite', 'GDBSend', 'GDBRecv', 'GDBExtra' ],
|
'GDBAll' : [ 'GDBMisc', 'GDBAcc', 'GDBRead', 'GDBWrite', 'GDBSend', 'GDBRecv', 'GDBExtra' ],
|
||||||
'ScsiAll' : [ 'ScsiDisk', 'ScsiCtrl', 'ScsiNone' ],
|
'ScsiAll' : [ 'ScsiDisk', 'ScsiCtrl', 'ScsiNone' ],
|
||||||
'DiskImageAll' : [ 'DiskImage', 'DiskImageRead', 'DiskImageWrite' ],
|
'DiskImageAll' : [ 'DiskImage', 'DiskImageRead', 'DiskImageWrite' ],
|
||||||
'EthernetAll' : [ 'Ethernet', 'EthernetPIO', 'EthernetDMA', 'EthernetData' ]
|
'EthernetAll' : [ 'Ethernet', 'EthernetPIO', 'EthernetDMA', 'EthernetData' ],
|
||||||
|
'IdeAll' : [ 'IdeCtrl', 'IdeDisk' ]
|
||||||
}
|
}
|
||||||
|
|
||||||
#############################################################
|
#############################################################
|
||||||
|
|
|
@ -117,106 +117,11 @@ LinuxSystem::LinuxSystem(const string _name, const uint64_t _init_param,
|
||||||
kernelStart = bootloader->textBase();
|
kernelStart = bootloader->textBase();
|
||||||
DPRINTF(Loader, "Bootloader entry at %#x\n", kernelEntry);
|
DPRINTF(Loader, "Bootloader entry at %#x\n", kernelEntry);
|
||||||
|
|
||||||
//INSTRUMENTATION CODEGEN BEGIN ONE
|
#ifdef DEBUG
|
||||||
if (bin == true) {
|
|
||||||
esIntrBin = new Statistics::MainBin(name() + " es_intr");
|
|
||||||
fnBins.insert(make_pair("es_intr", esIntrBin));
|
|
||||||
|
|
||||||
esRxeofBin = new Statistics::MainBin(name() + " es_rxeof");
|
|
||||||
fnBins.insert(make_pair("es_rxeof", esRxeofBin));
|
|
||||||
|
|
||||||
esNewbufBin = new Statistics::MainBin(name() + " es_newbuf");
|
|
||||||
fnBins.insert(make_pair("es_newbuf", esNewbufBin));
|
|
||||||
|
|
||||||
esDmaLoadBin = new Statistics::MainBin(name() + " es_dma_load");
|
|
||||||
fnBins.insert(make_pair("es_dma_load", esDmaLoadBin));
|
|
||||||
|
|
||||||
dmaMapLoadBin = new Statistics::MainBin(name() + " dma_map_load");
|
|
||||||
fnBins.insert(make_pair("dma_map_load", dmaMapLoadBin));
|
|
||||||
|
|
||||||
etherInputBin = new Statistics::MainBin(name() + " ether_input");
|
|
||||||
fnBins.insert(make_pair("ether_input", etherInputBin));
|
|
||||||
|
|
||||||
netisrInputBin = new Statistics::MainBin(name() + " netisr_input");
|
|
||||||
fnBins.insert(make_pair("netisr_input", netisrInputBin));
|
|
||||||
|
|
||||||
schednetisrIsrBin = new Statistics::MainBin(name() + " schednetisr_isr");
|
|
||||||
fnBins.insert(make_pair("schednetisr_isr", schednetisrIsrBin));
|
|
||||||
|
|
||||||
ipintrBin = new Statistics::MainBin(name() + " ipintr");
|
|
||||||
fnBins.insert(make_pair("ipintr", ipintrBin));
|
|
||||||
|
|
||||||
ipDooptionsBin = new Statistics::MainBin(name() + " ip_dooptions");
|
|
||||||
fnBins.insert(make_pair("ip_dooptions", ipDooptionsBin));
|
|
||||||
|
|
||||||
ipReassBin = new Statistics::MainBin(name() + " ip_reass");
|
|
||||||
fnBins.insert(make_pair("ip_reass", ipReassBin));
|
|
||||||
|
|
||||||
tcpInputBin = new Statistics::MainBin(name() + " tcp_input");
|
|
||||||
fnBins.insert(make_pair("tcp_input", tcpInputBin));
|
|
||||||
|
|
||||||
sbappendBin = new Statistics::MainBin(name() + " sbappend");
|
|
||||||
fnBins.insert(make_pair("sbappend", sbappendBin));
|
|
||||||
|
|
||||||
readBin = new Statistics::MainBin(name() + " read");
|
|
||||||
fnBins.insert(make_pair("read", readBin));
|
|
||||||
|
|
||||||
sooReadBin = new Statistics::MainBin(name() + " soo_read");
|
|
||||||
fnBins.insert(make_pair("soo_read", sooReadBin));
|
|
||||||
|
|
||||||
orecvBin = new Statistics::MainBin(name() + " orecv");
|
|
||||||
fnBins.insert(make_pair("orecv", orecvBin));
|
|
||||||
|
|
||||||
recvitBin = new Statistics::MainBin(name() + " recvit");
|
|
||||||
fnBins.insert(make_pair("recvit", recvitBin));
|
|
||||||
|
|
||||||
soreceiveBin = new Statistics::MainBin(name() + " soreceive");
|
|
||||||
fnBins.insert(make_pair("soreceive", soreceiveBin));
|
|
||||||
|
|
||||||
osendBin = new Statistics::MainBin(name() + " osend");
|
|
||||||
fnBins.insert(make_pair("osend", osendBin));
|
|
||||||
|
|
||||||
writeBin = new Statistics::MainBin(name() + " write");
|
|
||||||
fnBins.insert(make_pair("write", writeBin));
|
|
||||||
|
|
||||||
sooWriteBin = new Statistics::MainBin(name() + " soo_write");
|
|
||||||
fnBins.insert(make_pair("soo_write", sooWriteBin));
|
|
||||||
|
|
||||||
senditBin = new Statistics::MainBin(name() + " sendit");
|
|
||||||
fnBins.insert(make_pair("sendit", senditBin));
|
|
||||||
|
|
||||||
sosendBin = new Statistics::MainBin(name() + " sosend");
|
|
||||||
fnBins.insert(make_pair("sosend", sosendBin));
|
|
||||||
|
|
||||||
tcpSosendBin = new Statistics::MainBin(name() + " tcp_sosend");
|
|
||||||
fnBins.insert(make_pair("tcp_sosend", tcpSosendBin));
|
|
||||||
|
|
||||||
tcpOutputBin = new Statistics::MainBin(name() + " tcp_output");
|
|
||||||
fnBins.insert(make_pair("tcp_output", tcpOutputBin));
|
|
||||||
|
|
||||||
ipOutputBin = new Statistics::MainBin(name() + " ip_output");
|
|
||||||
fnBins.insert(make_pair("ip_output", ipOutputBin));
|
|
||||||
|
|
||||||
etherOutputBin = new Statistics::MainBin(name() + " ether_output");
|
|
||||||
fnBins.insert(make_pair("ether_output", etherOutputBin));
|
|
||||||
|
|
||||||
esStartBin = new Statistics::MainBin(name() + " es_start");
|
|
||||||
fnBins.insert(make_pair("es_start", esStartBin));
|
|
||||||
|
|
||||||
esTransmitBin = new Statistics::MainBin(name() + " es_transmit");
|
|
||||||
fnBins.insert(make_pair("es_transmit", esTransmitBin));
|
|
||||||
|
|
||||||
esTxeofBin = new Statistics::MainBin(name() + " es_txeof");
|
|
||||||
fnBins.insert(make_pair("es_txeof", esTxeofBin));
|
|
||||||
|
|
||||||
idleThreadBin = new Statistics::MainBin(name() + " idle_thread");
|
|
||||||
fnBins.insert(make_pair("idle_thread", idleThreadBin));
|
|
||||||
|
|
||||||
}
|
|
||||||
//INSTRUMENTATION CODEGEN END
|
|
||||||
|
|
||||||
kernelPanicEvent = new BreakPCEvent(&pcEventQueue, "kernel panic");
|
kernelPanicEvent = new BreakPCEvent(&pcEventQueue, "kernel panic");
|
||||||
consolePanicEvent = new BreakPCEvent(&pcEventQueue, "console panic");
|
consolePanicEvent = new BreakPCEvent(&pcEventQueue, "console panic");
|
||||||
|
#endif
|
||||||
|
|
||||||
badaddrEvent = new LinuxBadAddrEvent(&pcEventQueue, "badaddr");
|
badaddrEvent = new LinuxBadAddrEvent(&pcEventQueue, "badaddr");
|
||||||
skipPowerStateEvent = new LinuxSkipFuncEvent(&pcEventQueue,
|
skipPowerStateEvent = new LinuxSkipFuncEvent(&pcEventQueue,
|
||||||
"tl_v48_capture_power_state");
|
"tl_v48_capture_power_state");
|
||||||
|
@ -238,43 +143,6 @@ LinuxSystem::LinuxSystem(const string _name, const uint64_t _init_param,
|
||||||
"debug_printfr", true);
|
"debug_printfr", true);
|
||||||
dumpMbufEvent = new DumpMbufEvent(&pcEventQueue, "dump_mbuf");
|
dumpMbufEvent = new DumpMbufEvent(&pcEventQueue, "dump_mbuf");
|
||||||
*/
|
*/
|
||||||
#ifdef FS_MEASURE
|
|
||||||
//INSTRUMENTATION CODEGEN BEGIN TWO
|
|
||||||
if (bin == true) {
|
|
||||||
esIntrEvent = new LinuxFnEvent(&pcEventQueue, "es_intr", this);
|
|
||||||
esRxeofEvent = new LinuxFnEvent(&pcEventQueue, "es_rxeof", this);
|
|
||||||
esNewbufEvent = new LinuxFnEvent(&pcEventQueue, "es_newbuf", this);
|
|
||||||
esDmaLoadEvent = new LinuxFnEvent(&pcEventQueue, "es_dma_load", this);
|
|
||||||
dmaMapLoadEvent = new LinuxFnEvent(&pcEventQueue, "dma_map_load", this);
|
|
||||||
etherInputEvent = new LinuxFnEvent(&pcEventQueue, "ether_input", this);
|
|
||||||
netisrInputEvent = new LinuxFnEvent(&pcEventQueue, "netisr_input", this);
|
|
||||||
schednetisrIsrEvent = new LinuxFnEvent(&pcEventQueue, "schednetisr_isr", this);
|
|
||||||
ipintrEvent = new LinuxFnEvent(&pcEventQueue, "ipintr", this);
|
|
||||||
ipDooptionsEvent = new LinuxFnEvent(&pcEventQueue, "ip_dooptions", this);
|
|
||||||
ipReassEvent = new LinuxFnEvent(&pcEventQueue, "ip_reass", this);
|
|
||||||
tcpInputEvent = new LinuxFnEvent(&pcEventQueue, "tcp_input", this);
|
|
||||||
sbappendEvent = new LinuxFnEvent(&pcEventQueue, "sbappend", this);
|
|
||||||
readEvent = new LinuxFnEvent(&pcEventQueue, "read", this);
|
|
||||||
sooReadEvent = new LinuxFnEvent(&pcEventQueue, "soo_read", this);
|
|
||||||
orecvEvent = new LinuxFnEvent(&pcEventQueue, "orecv", this);
|
|
||||||
recvitEvent = new LinuxFnEvent(&pcEventQueue, "recvit", this);
|
|
||||||
soreceiveEvent = new LinuxFnEvent(&pcEventQueue, "soreceive", this);
|
|
||||||
osendEvent = new LinuxFnEvent(&pcEventQueue, "osend", this);
|
|
||||||
writeEvent = new LinuxFnEvent(&pcEventQueue, "write", this);
|
|
||||||
sooWriteEvent = new LinuxFnEvent(&pcEventQueue, "soo_write", this);
|
|
||||||
senditEvent = new LinuxFnEvent(&pcEventQueue, "sendit", this);
|
|
||||||
sosendEvent = new LinuxFnEvent(&pcEventQueue, "sosend", this);
|
|
||||||
tcpSosendEvent = new LinuxFnEvent(&pcEventQueue, "tcp_sosend", this);
|
|
||||||
tcpOutputEvent = new LinuxFnEvent(&pcEventQueue, "tcp_output", this);
|
|
||||||
ipOutputEvent = new LinuxFnEvent(&pcEventQueue, "ip_output", this);
|
|
||||||
etherOutputEvent = new LinuxFnEvent(&pcEventQueue, "ether_output", this);
|
|
||||||
esStartEvent = new LinuxFnEvent(&pcEventQueue, "es_start", this);
|
|
||||||
esTransmitEvent = new LinuxFnEvent(&pcEventQueue, "es_transmit", this);
|
|
||||||
esTxeofEvent = new LinuxFnEvent(&pcEventQueue, "es_txeof", this);
|
|
||||||
idleThreadEvent = new LinuxFnEvent(&pcEventQueue, "idle_thread", this);
|
|
||||||
}
|
|
||||||
//INSTRUMENTATION CODEGEN END
|
|
||||||
#endif //FS_MEASURE
|
|
||||||
|
|
||||||
Addr addr = 0;
|
Addr addr = 0;
|
||||||
|
|
||||||
|
@ -319,6 +187,7 @@ LinuxSystem::LinuxSystem(const string _name, const uint64_t _init_param,
|
||||||
} else
|
} else
|
||||||
panic("could not find hwprb to set system type/variation\n");
|
panic("could not find hwprb to set system type/variation\n");
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
if (kernelSymtab->findAddress("panic", addr))
|
if (kernelSymtab->findAddress("panic", addr))
|
||||||
kernelPanicEvent->schedule(addr);
|
kernelPanicEvent->schedule(addr);
|
||||||
else
|
else
|
||||||
|
@ -326,6 +195,7 @@ LinuxSystem::LinuxSystem(const string _name, const uint64_t _init_param,
|
||||||
|
|
||||||
if (consoleSymtab->findAddress("panic", addr))
|
if (consoleSymtab->findAddress("panic", addr))
|
||||||
consolePanicEvent->schedule(addr);
|
consolePanicEvent->schedule(addr);
|
||||||
|
#endif
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("badaddr", addr))
|
if (kernelSymtab->findAddress("badaddr", addr))
|
||||||
badaddrEvent->schedule(addr);
|
badaddrEvent->schedule(addr);
|
||||||
|
@ -360,213 +230,6 @@ LinuxSystem::LinuxSystem(const string _name, const uint64_t _init_param,
|
||||||
if (kernelSymtab->findAddress("m5_dump_mbuf", addr))
|
if (kernelSymtab->findAddress("m5_dump_mbuf", addr))
|
||||||
dumpMbufEvent->schedule(addr);
|
dumpMbufEvent->schedule(addr);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef FS_MEASURE
|
|
||||||
//INSTRUMENTATION CODEGEN BEGIN THREE
|
|
||||||
if (bin == true) {
|
|
||||||
if (kernelSymtab->findAddress("es_intr", addr))
|
|
||||||
esIntrEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'es_intr\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("es_rxeof", addr))
|
|
||||||
esRxeofEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'es_rxeof\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("es_newbuf", addr))
|
|
||||||
esNewbufEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'es_newbuf\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("es_dma_load", addr))
|
|
||||||
esDmaLoadEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'es_dma_load\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("dma_map_load", addr))
|
|
||||||
dmaMapLoadEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'dma_map_load\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("ether_input", addr))
|
|
||||||
etherInputEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'ether_input\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("netisr_input", addr))
|
|
||||||
netisrInputEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'netisr_input\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("schednetisr_isr", addr))
|
|
||||||
schednetisrIsrEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'schednetisr_isr\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("ipintr", addr))
|
|
||||||
ipintrEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'ipintr\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("ip_dooptions", addr))
|
|
||||||
ipDooptionsEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'ip_dooptions\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("ip_reass", addr))
|
|
||||||
ipReassEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'ip_reass\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("tcp_input", addr))
|
|
||||||
tcpInputEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'tcp_input\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("sbappend", addr))
|
|
||||||
sbappendEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'sbappend\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("read", addr))
|
|
||||||
readEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'read\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("soo_read", addr))
|
|
||||||
sooReadEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'soo_read\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("orecv", addr))
|
|
||||||
orecvEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'orecv\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("recvit", addr))
|
|
||||||
recvitEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'recvit\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("soreceive", addr))
|
|
||||||
soreceiveEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'soreceive\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("osend", addr))
|
|
||||||
osendEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'osend\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("write", addr))
|
|
||||||
writeEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'write\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("soo_write", addr))
|
|
||||||
sooWriteEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'soo_write\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("sendit", addr))
|
|
||||||
senditEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'sendit\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("sosend", addr))
|
|
||||||
sosendEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'sosend\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("tcp_sosend", addr))
|
|
||||||
tcpSosendEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'tcp_sosend\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("tcp_output", addr))
|
|
||||||
tcpOutputEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'tcp_output\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("ip_output", addr))
|
|
||||||
ipOutputEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'ip_output\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("ether_output", addr))
|
|
||||||
etherOutputEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'ether_output\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("es_start", addr))
|
|
||||||
esStartEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'es_start\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("es_transmit", addr))
|
|
||||||
esTransmitEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'es_transmit\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("es_txeof", addr))
|
|
||||||
esTxeofEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'es_txeof\'");
|
|
||||||
|
|
||||||
if (kernelSymtab->findAddress("idle_thread", addr))
|
|
||||||
idleThreadEvent->schedule(addr);
|
|
||||||
else
|
|
||||||
panic("could not find kernel symbol \'idle_thread\'");
|
|
||||||
|
|
||||||
}
|
|
||||||
//INSTRUMENTATION CODEGEN END
|
|
||||||
if (bin == true) {
|
|
||||||
fnCalls
|
|
||||||
.name(name() + ":fnCalls")
|
|
||||||
.desc("all fn calls being tracked")
|
|
||||||
;
|
|
||||||
|
|
||||||
populateMap("es_intr", "");
|
|
||||||
populateMap("es_rxeof", "es_intr");
|
|
||||||
populateMap("es_newbuf", "es_rxeof");
|
|
||||||
populateMap("es_dma_load", "es_newbuf");
|
|
||||||
populateMap("dma_map_load", "es_dma_load");
|
|
||||||
populateMap("ether_input", "es_rxeof");
|
|
||||||
populateMap("netisr_input", "ether_input");
|
|
||||||
populateMap("schednetisr_isr", "netisr_input");
|
|
||||||
|
|
||||||
populateMap("ipintr", "");
|
|
||||||
populateMap("ip_dooptions", "ipintr");
|
|
||||||
populateMap("ip_reass", "ipintr");
|
|
||||||
populateMap("tcp_input", "ipintr");
|
|
||||||
populateMap("sbappend", "tcp_input");
|
|
||||||
|
|
||||||
populateMap("read", "");
|
|
||||||
populateMap("orecv", "");
|
|
||||||
populateMap("soo_read", "read");
|
|
||||||
populateMap("recvit", "orecv");
|
|
||||||
populateMap("soreceive", "recvit");
|
|
||||||
populateMap("soreceive", "soo_read");
|
|
||||||
|
|
||||||
populateMap("write", "");
|
|
||||||
populateMap("osend", "");
|
|
||||||
populateMap("soo_write", "write");
|
|
||||||
populateMap("sendit", "osend");
|
|
||||||
populateMap("sosend", "sendit");
|
|
||||||
populateMap("sosend", "soo_write");
|
|
||||||
populateMap("tcp_sosend", "sosend");
|
|
||||||
populateMap("tcp_output", "tcp_sosend");
|
|
||||||
populateMap("ip_output", "tcp_output");
|
|
||||||
populateMap("ether_output", "ip_output");
|
|
||||||
populateMap("es_start", "ether_output");
|
|
||||||
populateMap("es_transmit", "es_start");
|
|
||||||
|
|
||||||
populateMap("es_txeof", "es_intr");
|
|
||||||
|
|
||||||
populateMap("idle_thread", "");
|
|
||||||
}
|
|
||||||
#endif //FS_MEASURE
|
|
||||||
}
|
}
|
||||||
|
|
||||||
LinuxSystem::~LinuxSystem()
|
LinuxSystem::~LinuxSystem()
|
||||||
|
@ -588,43 +251,6 @@ LinuxSystem::~LinuxSystem()
|
||||||
delete debugPrintfrEvent;
|
delete debugPrintfrEvent;
|
||||||
delete dumpMbufEvent;
|
delete dumpMbufEvent;
|
||||||
*/
|
*/
|
||||||
#ifdef FS_MEASURE
|
|
||||||
//INSTRUMENTATION CODEGEN BEGIN FOUR
|
|
||||||
if (bin == true) {
|
|
||||||
delete esIntrEvent;
|
|
||||||
delete esRxeofEvent;
|
|
||||||
delete esNewbufEvent;
|
|
||||||
delete esDmaLoadEvent;
|
|
||||||
delete dmaMapLoadEvent;
|
|
||||||
delete etherInputEvent;
|
|
||||||
delete netisrInputEvent;
|
|
||||||
delete schednetisrIsrEvent;
|
|
||||||
delete ipintrEvent;
|
|
||||||
delete ipDooptionsEvent;
|
|
||||||
delete ipReassEvent;
|
|
||||||
delete tcpInputEvent;
|
|
||||||
delete sbappendEvent;
|
|
||||||
delete readEvent;
|
|
||||||
delete sooReadEvent;
|
|
||||||
delete orecvEvent;
|
|
||||||
delete recvitEvent;
|
|
||||||
delete soreceiveEvent;
|
|
||||||
delete osendEvent;
|
|
||||||
delete writeEvent;
|
|
||||||
delete sooWriteEvent;
|
|
||||||
delete senditEvent;
|
|
||||||
delete sosendEvent;
|
|
||||||
delete tcpSosendEvent;
|
|
||||||
delete tcpOutputEvent;
|
|
||||||
delete ipOutputEvent;
|
|
||||||
delete etherOutputEvent;
|
|
||||||
delete esStartEvent;
|
|
||||||
delete esTransmitEvent;
|
|
||||||
delete esTxeofEvent;
|
|
||||||
delete idleThreadEvent;
|
|
||||||
}
|
|
||||||
//INSTRUMENTATION CODEGEN END
|
|
||||||
#endif //FS_MEASURE
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -658,7 +284,7 @@ LinuxSystem::registerExecContext(ExecContext *xc)
|
||||||
RemoteGDB *rgdb = new RemoteGDB(this, xc);
|
RemoteGDB *rgdb = new RemoteGDB(this, xc);
|
||||||
GDBListener *gdbl = new GDBListener(rgdb, 7000 + xcIndex);
|
GDBListener *gdbl = new GDBListener(rgdb, 7000 + xcIndex);
|
||||||
gdbl->listen();
|
gdbl->listen();
|
||||||
gdbl->accept();
|
// gdbl->accept();
|
||||||
|
|
||||||
if (remoteGDB.size() <= xcIndex) {
|
if (remoteGDB.size() <= xcIndex) {
|
||||||
remoteGDB.resize(xcIndex+1);
|
remoteGDB.resize(xcIndex+1);
|
||||||
|
@ -742,11 +368,12 @@ END_DECLARE_SIM_OBJECT_PARAMS(LinuxSystem)
|
||||||
|
|
||||||
BEGIN_INIT_SIM_OBJECT_PARAMS(LinuxSystem)
|
BEGIN_INIT_SIM_OBJECT_PARAMS(LinuxSystem)
|
||||||
|
|
||||||
|
|
||||||
INIT_PARAM_DFLT(bin, "is this system to be binned", false),
|
INIT_PARAM_DFLT(bin, "is this system to be binned", false),
|
||||||
INIT_PARAM(mem_ctl, "memory controller"),
|
INIT_PARAM(mem_ctl, "memory controller"),
|
||||||
INIT_PARAM(physmem, "phsyical memory"),
|
INIT_PARAM(physmem, "phsyical memory"),
|
||||||
INIT_PARAM_DFLT(init_param, "numerical value to pass into simulator", 0),
|
INIT_PARAM_DFLT(init_param, "numerical value to pass into simulator", 0),
|
||||||
INIT_PARAM(kernel_code, "file that contains the kernel code"),
|
INIT_PARAM(kernel_code, "file that contains the code"),
|
||||||
INIT_PARAM(console_code, "file that contains the console code"),
|
INIT_PARAM(console_code, "file that contains the console code"),
|
||||||
INIT_PARAM(pal_code, "file that contains palcode"),
|
INIT_PARAM(pal_code, "file that contains palcode"),
|
||||||
INIT_PARAM_DFLT(boot_osflags, "flags to pass to the kernel during boot",
|
INIT_PARAM_DFLT(boot_osflags, "flags to pass to the kernel during boot",
|
||||||
|
|
|
@ -62,41 +62,6 @@ class LinuxSystem : public System
|
||||||
SymbolTable *bootloaderSymtab;
|
SymbolTable *bootloaderSymtab;
|
||||||
SymbolTable *consoleSymtab;
|
SymbolTable *consoleSymtab;
|
||||||
|
|
||||||
|
|
||||||
//INSTRUMENTATION CODEGEN BEGIN ONE
|
|
||||||
Statistics::MainBin *esIntrBin;
|
|
||||||
Statistics::MainBin *esRxeofBin;
|
|
||||||
Statistics::MainBin *esNewbufBin;
|
|
||||||
Statistics::MainBin *esDmaLoadBin;
|
|
||||||
Statistics::MainBin *dmaMapLoadBin;
|
|
||||||
Statistics::MainBin *etherInputBin;
|
|
||||||
Statistics::MainBin *netisrInputBin;
|
|
||||||
Statistics::MainBin *schednetisrIsrBin;
|
|
||||||
Statistics::MainBin *ipintrBin;
|
|
||||||
Statistics::MainBin *ipDooptionsBin;
|
|
||||||
Statistics::MainBin *ipReassBin;
|
|
||||||
Statistics::MainBin *tcpInputBin;
|
|
||||||
Statistics::MainBin *sbappendBin;
|
|
||||||
Statistics::MainBin *readBin;
|
|
||||||
Statistics::MainBin *sooReadBin;
|
|
||||||
Statistics::MainBin *orecvBin;
|
|
||||||
Statistics::MainBin *recvitBin;
|
|
||||||
Statistics::MainBin *soreceiveBin;
|
|
||||||
Statistics::MainBin *osendBin;
|
|
||||||
Statistics::MainBin *writeBin;
|
|
||||||
Statistics::MainBin *sooWriteBin;
|
|
||||||
Statistics::MainBin *senditBin;
|
|
||||||
Statistics::MainBin *sosendBin;
|
|
||||||
Statistics::MainBin *tcpSosendBin;
|
|
||||||
Statistics::MainBin *tcpOutputBin;
|
|
||||||
Statistics::MainBin *ipOutputBin;
|
|
||||||
Statistics::MainBin *etherOutputBin;
|
|
||||||
Statistics::MainBin *esStartBin;
|
|
||||||
Statistics::MainBin *esTransmitBin;
|
|
||||||
Statistics::MainBin *esTxeofBin;
|
|
||||||
Statistics::MainBin *idleThreadBin;
|
|
||||||
//INSTRUMENTATION CODEGEN END
|
|
||||||
|
|
||||||
BreakPCEvent *kernelPanicEvent;
|
BreakPCEvent *kernelPanicEvent;
|
||||||
BreakPCEvent *consolePanicEvent;
|
BreakPCEvent *consolePanicEvent;
|
||||||
LinuxBadAddrEvent *badaddrEvent;
|
LinuxBadAddrEvent *badaddrEvent;
|
||||||
|
@ -110,40 +75,6 @@ class LinuxSystem : public System
|
||||||
LinuxDebugPrintfEvent *debugPrintfrEvent;
|
LinuxDebugPrintfEvent *debugPrintfrEvent;
|
||||||
LinuxDumpMbufEvent *dumpMbufEvent;
|
LinuxDumpMbufEvent *dumpMbufEvent;
|
||||||
|
|
||||||
//INSTRUMENTATION CODEGEN BEGIN TWO
|
|
||||||
FnEvent *esIntrEvent;
|
|
||||||
FnEvent *esRxeofEvent;
|
|
||||||
FnEvent *esNewbufEvent;
|
|
||||||
FnEvent *esDmaLoadEvent;
|
|
||||||
FnEvent *dmaMapLoadEvent;
|
|
||||||
FnEvent *etherInputEvent;
|
|
||||||
FnEvent *netisrInputEvent;
|
|
||||||
FnEvent *schednetisrIsrEvent;
|
|
||||||
FnEvent *ipintrEvent;
|
|
||||||
FnEvent *ipDooptionsEvent;
|
|
||||||
FnEvent *ipReassEvent;
|
|
||||||
FnEvent *tcpInputEvent;
|
|
||||||
FnEvent *sbappendEvent;
|
|
||||||
FnEvent *readEvent;
|
|
||||||
FnEvent *sooReadEvent;
|
|
||||||
FnEvent *orecvEvent;
|
|
||||||
FnEvent *recvitEvent;
|
|
||||||
FnEvent *soreceiveEvent;
|
|
||||||
FnEvent *osendEvent;
|
|
||||||
FnEvent *writeEvent;
|
|
||||||
FnEvent *sooWriteEvent;
|
|
||||||
FnEvent *senditEvent;
|
|
||||||
FnEvent *sosendEvent;
|
|
||||||
FnEvent *tcpSosendEvent;
|
|
||||||
FnEvent *tcpOutputEvent;
|
|
||||||
FnEvent *ipOutputEvent;
|
|
||||||
FnEvent *etherOutputEvent;
|
|
||||||
FnEvent *esStartEvent;
|
|
||||||
FnEvent *esTransmitEvent;
|
|
||||||
FnEvent *esTxeofEvent;
|
|
||||||
FnEvent *idleThreadEvent;
|
|
||||||
//INSTRUMENTATION CODEGEN END
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
Addr kernelStart;
|
Addr kernelStart;
|
||||||
|
|
Loading…
Reference in a new issue