From e8bcecd0a04638e9d9e6306cbe515c40e9ba0817 Mon Sep 17 00:00:00 2001 From: Benjamin Nash Date: Thu, 23 Jun 2005 16:27:06 -0400 Subject: Changed timer functionality, ide disk interrupts, and TsunamiFake class to improve FreeBSD compatibility. dev/ide_disk.cc: Make ide disk set interrupts correctly. dev/tsunami_io.cc: dev/tsunami_io.hh: Implement read of timer counts. kern/freebsd/freebsd_system.cc: kern/freebsd/freebsd_system.hh: Remove SkipFuncEvents that we don't need to skip. python/m5/objects/Tsunami.py: Add size parameter to TsunamiFake class. --HG-- extra : convert_revision : a87e74f2cac0036060ca8cb3fde4760d8c91a5db --- kern/freebsd/freebsd_system.cc | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) (limited to 'kern/freebsd/freebsd_system.cc') diff --git a/kern/freebsd/freebsd_system.cc b/kern/freebsd/freebsd_system.cc index 08d1af824..d7d32cc66 100644 --- a/kern/freebsd/freebsd_system.cc +++ b/kern/freebsd/freebsd_system.cc @@ -55,32 +55,13 @@ FreebsdSystem::FreebsdSystem(Params *p) Addr addr = 0; /** - * Any time ide_delay_50ms, calibarte_delay or - * determine_cpu_caches is called just skip the - * function. Currently determine_cpu_caches only is used put - * information in proc, however if that changes in the future we - * will have to fill in the cache size variables appropriately. + * Any time DELAY is called just skip the function. + * Replace calibrate_clocks with function below. */ skipDelayEvent = new SkipFuncEvent(&pcEventQueue, "DELAY"); if (kernelSymtab->findAddress("DELAY", addr)) skipDelayEvent->schedule(addr+sizeof(MachInst)); - skipOROMEvent = new SkipFuncEvent(&pcEventQueue, "orm_identify"); - if (kernelSymtab->findAddress("orm_identify", addr)) - skipOROMEvent->schedule(addr+sizeof(MachInst)); - - skipAicEvent = new SkipFuncEvent(&pcEventQueue, "ahc_isa_identify"); - if (kernelSymtab->findAddress("ahc_isa_identify", addr)) - skipAicEvent->schedule(addr+sizeof(MachInst)); - - skipPNPEvent = new SkipFuncEvent(&pcEventQueue, "pnp_identify"); - if (kernelSymtab->findAddress("pnp_identify", addr)) - skipPNPEvent->schedule(addr+sizeof(MachInst)); - - skipATAEvent = new SkipFuncEvent(&pcEventQueue, "ata_attach"); - if (kernelSymtab->findAddress("ata_attach", addr)) - skipATAEvent->schedule(addr+sizeof(MachInst)); - skipCalibrateClocks = new FreebsdSkipCalibrateClocksEvent(&pcEventQueue, "calibrate_clocks"); if (kernelSymtab->findAddress("calibrate_clocks", addr)) skipCalibrateClocks->schedule(addr + sizeof(MachInst) * 2); @@ -91,10 +72,6 @@ FreebsdSystem::FreebsdSystem(Params *p) FreebsdSystem::~FreebsdSystem() { delete skipDelayEvent; - delete skipOROMEvent; - delete skipAicEvent; - delete skipATAEvent; - delete skipPNPEvent; delete skipCalibrateClocks; } -- cgit v1.2.3