2005-06-05 07:22:21 +02:00
|
|
|
/*
|
2005-06-05 11:16:00 +02:00
|
|
|
* Copyright (c) 2005 The Regents of The University of Michigan
|
2005-06-05 07:22:21 +02:00
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions are
|
|
|
|
* met: redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer;
|
|
|
|
* redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution;
|
|
|
|
* neither the name of the copyright holders nor the names of its
|
|
|
|
* contributors may be used to endorse or promote products derived from
|
|
|
|
* this software without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/** @file
|
|
|
|
* Implements a 8250 UART
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <string>
|
|
|
|
#include <vector>
|
|
|
|
|
|
|
|
#include "base/inifile.hh"
|
|
|
|
#include "base/str.hh" // for to_number
|
|
|
|
#include "base/trace.hh"
|
|
|
|
#include "dev/simconsole.hh"
|
|
|
|
#include "dev/uart8250.hh"
|
|
|
|
#include "dev/platform.hh"
|
|
|
|
#include "mem/bus/bus.hh"
|
|
|
|
#include "mem/bus/pio_interface.hh"
|
|
|
|
#include "mem/bus/pio_interface_impl.hh"
|
2005-06-05 07:24:17 +02:00
|
|
|
#include "mem/functional/memory_control.hh"
|
2005-06-05 07:22:21 +02:00
|
|
|
#include "sim/builder.hh"
|
|
|
|
|
|
|
|
using namespace std;
|
Changes to untemplate StaticInst and StaticInstPtr, change the isa to a namespace instead of a class, an improvement to the architecture specific header file selection system, and fixed up a few include paths.
arch/alpha/alpha_linux_process.cc:
Added using directive for AlphaISA namespace
arch/alpha/alpha_memory.hh:
arch/alpha/isa/branch.isa:
cpu/pc_event.hh:
Added typedefs for Addr
arch/alpha/alpha_tru64_process.cc:
arch/alpha/arguments.cc:
Added using directive for AlphaISA
arch/alpha/ev5.hh:
Added an include of arch/alpha/isa_traits.hh, and a using directive for the AlphaISA namespace.
arch/alpha/faults.hh:
Added a typedef for the Addr type, and changed the formatting of the faults slightly.
arch/alpha/isa/main.isa:
Untemplatized StaticInst, added a using for namespace AlphaISA to show up in decoder.cc and the exec.ccs, relocated makeNop to decoder.hh
arch/alpha/isa/mem.isa:
Untemplatized StaticInst and StaticInstPtr
arch/alpha/isa/pal.isa:
cpu/base_dyn_inst.cc:
Untemplatized StaticInstPtr
arch/alpha/isa_traits.hh:
Changed variables to be externs instead of static since they are part of a namespace and not a class.
arch/alpha/stacktrace.cc:
Untemplatized StaticInstPtr, and added a using directive for AlphaISA.
arch/alpha/stacktrace.hh:
Added some typedefs for Addr and MachInst, and untemplatized StaticInstPtr
arch/alpha/vtophys.cc:
Added a using directive for AlphaISA
arch/alpha/vtophys.hh:
Added the AlphaISA namespace specifier where needed
arch/isa_parser.py:
Changed the placement of the definition of the decodeInst function to be outside the namespaceInst namespace.
base/loader/object_file.hh:
cpu/o3/bpred_unit.hh:
Added a typedef for Addr
base/loader/symtab.hh:
Added a typedef for Addr, and added a TheISA to Addr in another typedef
base/remote_gdb.cc:
Added a using namespace TheISA, and untemplatized StaticInstPtr
base/remote_gdb.hh:
Added typedefs for Addr and MachInst
cpu/base.cc:
Added TheISA specifier to some variables exported from the isa.
cpu/base.hh:
Added a typedef for Addr, and TheISA to some variables from the ISA
cpu/base_dyn_inst.hh:
Untemplatized StaticInstPtr, and added TheISA specifier to some variables from the ISA.
cpu/exec_context.hh:
Added some typedefs for types from the isa, and added TheISA specifier to some variables from the isa
cpu/exetrace.hh:
Added typedefs for some types from the ISA, and untemplatized StaticInstPtr
cpu/memtest/memtest.cc:
cpu/o3/btb.cc:
dev/baddev.cc:
dev/ide_ctrl.cc:
dev/ide_disk.cc:
dev/isa_fake.cc:
dev/ns_gige.cc:
dev/pciconfigall.cc:
dev/platform.cc:
dev/sinic.cc:
dev/uart8250.cc:
kern/freebsd/freebsd_system.cc:
kern/linux/linux_system.cc:
kern/system_events.cc:
kern/tru64/dump_mbuf.cc:
kern/tru64/tru64_events.cc:
sim/process.cc:
sim/pseudo_inst.cc:
sim/system.cc:
Added using namespace TheISA
cpu/memtest/memtest.hh:
cpu/trace/opt_cpu.hh:
cpu/trace/reader/itx_reader.hh:
dev/ide_disk.hh:
dev/pcidev.hh:
dev/platform.hh:
dev/tsunami.hh:
sim/system.hh:
sim/vptr.hh:
Added typedef for Addr
cpu/o3/2bit_local_pred.hh:
Changed the include to use arch/isa_traits.hh instead of arch/alpha/isa_traits.hh. Added typedef for Addr
cpu/o3/alpha_cpu.hh:
Added typedefs for Addr and IntReg
cpu/o3/alpha_cpu_impl.hh:
Added this-> to setNextPC to fix a problem since it didn't depend on template parameters any more. Removed "typename" where it was no longer needed.
cpu/o3/alpha_dyn_inst.hh:
Cleaned up some typedefs, and untemplatized StaticInst
cpu/o3/alpha_dyn_inst_impl.hh:
untemplatized StaticInstPtr
cpu/o3/alpha_impl.hh:
Fixed up a typedef of MachInst
cpu/o3/bpred_unit_impl.hh:
Added a using TheISA::MachInst to a function
cpu/o3/btb.hh:
Changed an include from arch/alpha/isa_traits.hh to arch/isa_traits.hh, and added a typedef for Addr
cpu/o3/commit.hh:
Removed a typedef of Impl::ISA as ISA, since TheISA takes care of this now.
cpu/o3/cpu.cc:
Cleaned up namespace issues
cpu/o3/cpu.hh:
Cleaned up namespace usage
cpu/o3/decode.hh:
Removed typedef of ISA, and changed it to TheISA
cpu/o3/fetch.hh:
Fized up typedefs, and changed ISA to TheISA
cpu/o3/free_list.hh:
Changed include of arch/alpha/isa_traits.hh to arch/isa_traits.hh
cpu/o3/iew.hh:
Removed typedef of ISA
cpu/o3/iew_impl.hh:
Added TheISA namespace specifier to MachInst
cpu/o3/ras.hh:
Changed include from arch/alpha/isa_traits.hh to arch/isa_traits.hh, and added a typedef for Addr.
cpu/o3/regfile.hh:
Changed ISA to TheISA, and added some typedefs for Addr, IntReg, FloatReg, and MiscRegFile
cpu/o3/rename.hh:
Changed ISA to TheISA, and added a typedef for RegIndex
cpu/o3/rename_map.hh:
Added an include for arch/isa_traits.hh, and a typedef for RegIndex
cpu/o3/rob.hh:
Added a typedef for RegIndex
cpu/o3/store_set.hh:
cpu/o3/tournament_pred.hh:
Changed an include of arch/alpha/isa_traits.hh to arch/isa_traits.hh, and added a typedef of Addr
cpu/ozone/cpu.hh:
Changed ISA into TheISA, and untemplatized StaticInst
cpu/pc_event.cc:
Added namespace specifier TheISA to Addr types
cpu/profile.hh:
kern/kernel_stats.hh:
Added typedef for Addr, and untemplatized StaticInstPtr
cpu/simple/cpu.cc:
Changed using directive from LittleEndianGuest to AlphaISA, which will contain both namespaces. Added TheISA where needed, and untemplatized StaticInst
cpu/simple/cpu.hh:
Added a typedef for MachInst, and untemplatized StaticInst
cpu/static_inst.cc:
Untemplatized StaticInst
cpu/static_inst.hh:
Untemplatized StaticInst by using the TheISA namespace
dev/alpha_console.cc:
Added using namespace AlphaISA
dev/simple_disk.hh:
Added typedef for Addr and fixed up some formatting
dev/sinicreg.hh:
Added TheISA namespace specifier where needed
dev/tsunami.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
Added using namespace TheISA. It might be better for it to be AlphaISA
dev/tsunami_cchip.cc:
Added typedef for TheISA. It might be better for it to be AlphaISA
kern/linux/aligned.hh:
sim/pseudo_inst.hh:
Added TheISA namespace specifier to Addr
kern/linux/linux_threadinfo.hh:
Added typedef for Addr, and TheISA namespace specifier to StackPointerReg
kern/tru64/mbuf.hh:
Added TheISA to Addr type in structs
sim/process.hh:
Added typedefs of Addr, RegFile, and MachInst
sim/syscall_emul.cc:
Added using namespace TheISA, and a cast of VMPageSize to the int type
sim/syscall_emul.hh:
Added typecast for Addr, and TheISA namespace specifier for where needed
--HG--
extra : convert_revision : 91d4f6ca33a73b21c1f1771d74bfdea3b80eff45
2006-02-19 08:34:37 +01:00
|
|
|
using namespace TheISA;
|
2005-06-05 07:22:21 +02:00
|
|
|
|
|
|
|
Uart8250::IntrEvent::IntrEvent(Uart8250 *u, int bit)
|
|
|
|
: Event(&mainEventQueue), uart(u)
|
|
|
|
{
|
|
|
|
DPRINTF(Uart, "UART Interrupt Event Initilizing\n");
|
|
|
|
intrBit = bit;
|
|
|
|
}
|
|
|
|
|
|
|
|
const char *
|
|
|
|
Uart8250::IntrEvent::description()
|
|
|
|
{
|
|
|
|
return "uart interrupt delay event";
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Uart8250::IntrEvent::process()
|
|
|
|
{
|
|
|
|
if (intrBit & uart->IER) {
|
|
|
|
DPRINTF(Uart, "UART InterEvent, interrupting\n");
|
|
|
|
uart->platform->postConsoleInt();
|
|
|
|
uart->status |= intrBit;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
DPRINTF(Uart, "UART InterEvent, not interrupting\n");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The linux serial driver (8250.c about line 1182) loops reading from
|
|
|
|
* the device until the device reports it has no more data to
|
|
|
|
* read. After a maximum of 255 iterations the code prints "serial8250
|
|
|
|
* too much work for irq X," and breaks out of the loop. Since the
|
|
|
|
* simulated system is so much slower than the actual system, if a
|
|
|
|
* user is typing on the keyboard it is very easy for them to provide
|
|
|
|
* input at a fast enough rate to not allow the loop to exit and thus
|
|
|
|
* the error to be printed. This magic number provides a delay between
|
|
|
|
* the time the UART receives a character to send to the simulated
|
|
|
|
* system and the time it actually notifies the system it has a
|
|
|
|
* character to send to alleviate this problem. --Ali
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
Uart8250::IntrEvent::scheduleIntr()
|
|
|
|
{
|
|
|
|
static const Tick interval = (Tick)((Clock::Float::s / 2e9) * 450);
|
|
|
|
DPRINTF(Uart, "Scheduling IER interrupt for %#x, at cycle %lld\n", intrBit,
|
|
|
|
curTick + interval);
|
|
|
|
if (!scheduled())
|
|
|
|
schedule(curTick + interval);
|
|
|
|
else
|
|
|
|
reschedule(curTick + interval);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-11-20 22:57:53 +01:00
|
|
|
Uart8250::Uart8250(const string &name, SimConsole *c, MemoryController *mmu,
|
|
|
|
Addr a, Addr s, HierParams *hier, Bus *pio_bus,
|
|
|
|
Tick pio_latency, Platform *p)
|
|
|
|
: Uart(name, c, mmu, a, s, hier, pio_bus, pio_latency, p),
|
2005-06-05 07:22:21 +02:00
|
|
|
txIntrEvent(this, TX_INT), rxIntrEvent(this, RX_INT)
|
|
|
|
{
|
|
|
|
IER = 0;
|
|
|
|
DLAB = 0;
|
|
|
|
LCR = 0;
|
|
|
|
MCR = 0;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2006-02-22 02:10:40 +01:00
|
|
|
Fault
|
2005-06-05 07:22:21 +02:00
|
|
|
Uart8250::read(MemReqPtr &req, uint8_t *data)
|
|
|
|
{
|
|
|
|
Addr daddr = req->paddr - (addr & EV5::PAddrImplMask);
|
|
|
|
DPRINTF(Uart, " read register %#x\n", daddr);
|
|
|
|
|
|
|
|
assert(req->size == 1);
|
|
|
|
|
|
|
|
switch (daddr) {
|
|
|
|
case 0x0:
|
|
|
|
if (!(LCR & 0x80)) { // read byte
|
|
|
|
if (cons->dataAvailable())
|
|
|
|
cons->in(*data);
|
|
|
|
else {
|
|
|
|
*(uint8_t*)data = 0;
|
|
|
|
// A limited amount of these are ok.
|
|
|
|
DPRINTF(Uart, "empty read of RX register\n");
|
|
|
|
}
|
|
|
|
status &= ~RX_INT;
|
|
|
|
platform->clearConsoleInt();
|
|
|
|
|
|
|
|
if (cons->dataAvailable() && (IER & UART_IER_RDI))
|
|
|
|
rxIntrEvent.scheduleIntr();
|
|
|
|
} else { // dll divisor latch
|
|
|
|
;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 0x1:
|
|
|
|
if (!(LCR & 0x80)) { // Intr Enable Register(IER)
|
|
|
|
*(uint8_t*)data = IER;
|
|
|
|
} else { // DLM divisor latch MSB
|
|
|
|
;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 0x2: // Intr Identification Register (IIR)
|
|
|
|
DPRINTF(Uart, "IIR Read, status = %#x\n", (uint32_t)status);
|
2005-08-15 22:59:58 +02:00
|
|
|
|
2005-08-16 21:44:57 +02:00
|
|
|
if (status & RX_INT) /* Rx data interrupt has a higher priority */
|
2005-08-15 22:59:58 +02:00
|
|
|
*(uint8_t*)data = IIR_RXID;
|
2005-08-16 21:44:57 +02:00
|
|
|
else if (status & TX_INT)
|
|
|
|
*(uint8_t*)data = IIR_TXID;
|
2005-06-05 07:22:21 +02:00
|
|
|
else
|
2005-08-15 22:59:58 +02:00
|
|
|
*(uint8_t*)data = IIR_NOPEND;
|
2005-08-16 21:44:57 +02:00
|
|
|
|
|
|
|
//Tx interrupts are cleared on IIR reads
|
|
|
|
status &= ~TX_INT;
|
2005-06-05 07:22:21 +02:00
|
|
|
break;
|
|
|
|
case 0x3: // Line Control Register (LCR)
|
|
|
|
*(uint8_t*)data = LCR;
|
|
|
|
break;
|
|
|
|
case 0x4: // Modem Control Register (MCR)
|
|
|
|
break;
|
|
|
|
case 0x5: // Line Status Register (LSR)
|
|
|
|
uint8_t lsr;
|
|
|
|
lsr = 0;
|
|
|
|
// check if there are any bytes to be read
|
|
|
|
if (cons->dataAvailable())
|
|
|
|
lsr = UART_LSR_DR;
|
|
|
|
lsr |= UART_LSR_TEMT | UART_LSR_THRE;
|
|
|
|
*(uint8_t*)data = lsr;
|
|
|
|
break;
|
|
|
|
case 0x6: // Modem Status Register (MSR)
|
|
|
|
*(uint8_t*)data = 0;
|
|
|
|
break;
|
|
|
|
case 0x7: // Scratch Register (SCR)
|
|
|
|
*(uint8_t*)data = 0; // doesn't exist with at 8250.
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
panic("Tried to access a UART port that doesn't exist\n");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
Changed the fault enum into a class, and fixed everything up to work with it. Next, the faults need to be pulled out of all the other code so that they are only used to communicate between the CPU and the ISA.
SConscript:
The new faults.cc file in sim allocates the system wide faults. When these faults are generated through a function interface in the ISA, this file may go away.
arch/alpha/alpha_memory.cc:
Changed Fault to Fault * and took the underscores out of fault names.
arch/alpha/alpha_memory.hh:
Changed Fault to Fault *. Also, added an include for the alpha faults.
arch/alpha/ev5.cc:
Changed the fault_addr array into a fault_addr function. Once all of the faults can be expected to have the same type, fault_addr can go away completely and the info it provided will come from the fault itself. Also, Fault was changed to Fault *, and underscores were taken out of fault names.
arch/alpha/isa/decoder.isa:
Changed Fault to Fault * and took the underscores out fault names.
arch/alpha/isa/fp.isa:
Changed Fault to Fault *, and took the underscores out of fault names.
arch/alpha/isa/main.isa:
Changed Fault to Fault *, removed underscores from fault names, and made an include of the alpha faults show up in all the generated files.
arch/alpha/isa/mem.isa:
Changed Fault to Fault * and removed underscores from fault names.
arch/alpha/isa/unimp.isa:
arch/alpha/isa/unknown.isa:
cpu/exec_context.hh:
cpu/ozone/cpu.hh:
cpu/simple/cpu.cc:
dev/alpha_console.cc:
dev/ide_ctrl.cc:
dev/isa_fake.cc:
dev/pciconfigall.cc:
dev/pcidev.cc:
dev/pcidev.hh:
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
Changed Fault to Fault *, and removed underscores from fault names.
arch/alpha/isa_traits.hh:
Changed the include of arch/alpha/faults.hh to sim/faults.hh, since the alpha faults weren't needed.
cpu/base_dyn_inst.cc:
Changed Fault to Fault *, and removed underscores from fault names. This file probably shouldn't use the Unimplemented Opcode fault.
cpu/base_dyn_inst.hh:
Changed Fault to Fault * and took the underscores out of the fault names.
cpu/exec_context.cc:
cpu/o3/alpha_dyn_inst.hh:
cpu/o3/alpha_dyn_inst_impl.hh:
cpu/o3/fetch.hh:
dev/alpha_console.hh:
dev/baddev.hh:
dev/ide_ctrl.hh:
dev/isa_fake.hh:
dev/ns_gige.hh:
dev/pciconfigall.hh:
dev/sinic.hh:
dev/tsunami_cchip.hh:
dev/tsunami_io.hh:
dev/tsunami_pchip.hh:
dev/uart.hh:
dev/uart8250.hh:
Changed Fault to Fault *.
cpu/o3/alpha_cpu.hh:
Changed Fault to Fault *, removed underscores from fault names.
cpu/o3/alpha_cpu_impl.hh:
Changed Fault to Fault *, removed underscores from fault names, and changed the fault_addr array to the fault_addr function. Once all faults are from the ISA, this function will probably go away.
cpu/o3/commit_impl.hh:
cpu/o3/fetch_impl.hh:
dev/baddev.cc:
Changed Fault to Fault *, and removed underscores from the fault names.
cpu/o3/regfile.hh:
Added an include for the alpha specific faults which will hopefully go away once the ipr stuff is moved, changed Fault to Fault *, and removed the underscores from fault names.
cpu/simple/cpu.hh:
Changed Fault to Fault *
dev/ns_gige.cc:
Changed Fault to Fault *, and removdd underscores from fault names.
dev/sinic.cc:
Changed Fault to Fault *, and removed the underscores from fault names.
dev/uart8250.cc:
Chanted Fault to Fault *, and removed underscores from fault names.
kern/kernel_stats.cc:
Removed underscores from fault names, and from NumFaults.
kern/kernel_stats.hh:
Changed the predeclaration of Fault from an enum to a class, and changd the "fault" function to work with the classes instead of the enum. Once there are no system wide faults anymore, this code will simplify back to something like it was originally.
sim/faults.cc:
This allocates the system wide faults.
sim/faults.hh:
This declares the system wide faults.
sim/syscall_emul.cc:
sim/syscall_emul.hh:
Removed the underscores from fault names.
--HG--
rename : arch/alpha/faults.cc => sim/faults.cc
rename : arch/alpha/faults.hh => sim/faults.hh
extra : convert_revision : 253d39258237333ae8ec4d8047367cb3ea68569d
2006-02-16 07:22:51 +01:00
|
|
|
return NoFault;
|
2005-06-05 07:22:21 +02:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2006-02-22 02:10:40 +01:00
|
|
|
Fault
|
2005-06-05 07:22:21 +02:00
|
|
|
Uart8250::write(MemReqPtr &req, const uint8_t *data)
|
|
|
|
{
|
|
|
|
Addr daddr = req->paddr - (addr & EV5::PAddrImplMask);
|
|
|
|
|
|
|
|
DPRINTF(Uart, " write register %#x value %#x\n", daddr, *(uint8_t*)data);
|
|
|
|
|
|
|
|
switch (daddr) {
|
|
|
|
case 0x0:
|
|
|
|
if (!(LCR & 0x80)) { // write byte
|
|
|
|
cons->out(*(uint8_t *)data);
|
|
|
|
platform->clearConsoleInt();
|
|
|
|
status &= ~TX_INT;
|
|
|
|
if (UART_IER_THRI & IER)
|
|
|
|
txIntrEvent.scheduleIntr();
|
|
|
|
} else { // dll divisor latch
|
|
|
|
;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 0x1:
|
|
|
|
if (!(LCR & 0x80)) { // Intr Enable Register(IER)
|
|
|
|
IER = *(uint8_t*)data;
|
|
|
|
if (UART_IER_THRI & IER)
|
|
|
|
{
|
|
|
|
DPRINTF(Uart, "IER: IER_THRI set, scheduling TX intrrupt\n");
|
|
|
|
txIntrEvent.scheduleIntr();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
DPRINTF(Uart, "IER: IER_THRI cleared, descheduling TX intrrupt\n");
|
|
|
|
if (txIntrEvent.scheduled())
|
|
|
|
txIntrEvent.deschedule();
|
|
|
|
if (status & TX_INT)
|
|
|
|
platform->clearConsoleInt();
|
|
|
|
status &= ~TX_INT;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((UART_IER_RDI & IER) && cons->dataAvailable()) {
|
|
|
|
DPRINTF(Uart, "IER: IER_RDI set, scheduling RX intrrupt\n");
|
|
|
|
rxIntrEvent.scheduleIntr();
|
|
|
|
} else {
|
|
|
|
DPRINTF(Uart, "IER: IER_RDI cleared, descheduling RX intrrupt\n");
|
|
|
|
if (rxIntrEvent.scheduled())
|
|
|
|
rxIntrEvent.deschedule();
|
|
|
|
if (status & RX_INT)
|
|
|
|
platform->clearConsoleInt();
|
|
|
|
status &= ~RX_INT;
|
|
|
|
}
|
|
|
|
} else { // DLM divisor latch MSB
|
|
|
|
;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 0x2: // FIFO Control Register (FCR)
|
|
|
|
break;
|
|
|
|
case 0x3: // Line Control Register (LCR)
|
|
|
|
LCR = *(uint8_t*)data;
|
|
|
|
break;
|
|
|
|
case 0x4: // Modem Control Register (MCR)
|
|
|
|
if (*(uint8_t*)data == (UART_MCR_LOOP | 0x0A))
|
|
|
|
MCR = 0x9A;
|
|
|
|
break;
|
|
|
|
case 0x7: // Scratch Register (SCR)
|
|
|
|
// We are emulating a 8250 so we don't have a scratch reg
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
panic("Tried to access a UART port that doesn't exist\n");
|
|
|
|
break;
|
|
|
|
}
|
Changed the fault enum into a class, and fixed everything up to work with it. Next, the faults need to be pulled out of all the other code so that they are only used to communicate between the CPU and the ISA.
SConscript:
The new faults.cc file in sim allocates the system wide faults. When these faults are generated through a function interface in the ISA, this file may go away.
arch/alpha/alpha_memory.cc:
Changed Fault to Fault * and took the underscores out of fault names.
arch/alpha/alpha_memory.hh:
Changed Fault to Fault *. Also, added an include for the alpha faults.
arch/alpha/ev5.cc:
Changed the fault_addr array into a fault_addr function. Once all of the faults can be expected to have the same type, fault_addr can go away completely and the info it provided will come from the fault itself. Also, Fault was changed to Fault *, and underscores were taken out of fault names.
arch/alpha/isa/decoder.isa:
Changed Fault to Fault * and took the underscores out fault names.
arch/alpha/isa/fp.isa:
Changed Fault to Fault *, and took the underscores out of fault names.
arch/alpha/isa/main.isa:
Changed Fault to Fault *, removed underscores from fault names, and made an include of the alpha faults show up in all the generated files.
arch/alpha/isa/mem.isa:
Changed Fault to Fault * and removed underscores from fault names.
arch/alpha/isa/unimp.isa:
arch/alpha/isa/unknown.isa:
cpu/exec_context.hh:
cpu/ozone/cpu.hh:
cpu/simple/cpu.cc:
dev/alpha_console.cc:
dev/ide_ctrl.cc:
dev/isa_fake.cc:
dev/pciconfigall.cc:
dev/pcidev.cc:
dev/pcidev.hh:
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
Changed Fault to Fault *, and removed underscores from fault names.
arch/alpha/isa_traits.hh:
Changed the include of arch/alpha/faults.hh to sim/faults.hh, since the alpha faults weren't needed.
cpu/base_dyn_inst.cc:
Changed Fault to Fault *, and removed underscores from fault names. This file probably shouldn't use the Unimplemented Opcode fault.
cpu/base_dyn_inst.hh:
Changed Fault to Fault * and took the underscores out of the fault names.
cpu/exec_context.cc:
cpu/o3/alpha_dyn_inst.hh:
cpu/o3/alpha_dyn_inst_impl.hh:
cpu/o3/fetch.hh:
dev/alpha_console.hh:
dev/baddev.hh:
dev/ide_ctrl.hh:
dev/isa_fake.hh:
dev/ns_gige.hh:
dev/pciconfigall.hh:
dev/sinic.hh:
dev/tsunami_cchip.hh:
dev/tsunami_io.hh:
dev/tsunami_pchip.hh:
dev/uart.hh:
dev/uart8250.hh:
Changed Fault to Fault *.
cpu/o3/alpha_cpu.hh:
Changed Fault to Fault *, removed underscores from fault names.
cpu/o3/alpha_cpu_impl.hh:
Changed Fault to Fault *, removed underscores from fault names, and changed the fault_addr array to the fault_addr function. Once all faults are from the ISA, this function will probably go away.
cpu/o3/commit_impl.hh:
cpu/o3/fetch_impl.hh:
dev/baddev.cc:
Changed Fault to Fault *, and removed underscores from the fault names.
cpu/o3/regfile.hh:
Added an include for the alpha specific faults which will hopefully go away once the ipr stuff is moved, changed Fault to Fault *, and removed the underscores from fault names.
cpu/simple/cpu.hh:
Changed Fault to Fault *
dev/ns_gige.cc:
Changed Fault to Fault *, and removdd underscores from fault names.
dev/sinic.cc:
Changed Fault to Fault *, and removed the underscores from fault names.
dev/uart8250.cc:
Chanted Fault to Fault *, and removed underscores from fault names.
kern/kernel_stats.cc:
Removed underscores from fault names, and from NumFaults.
kern/kernel_stats.hh:
Changed the predeclaration of Fault from an enum to a class, and changd the "fault" function to work with the classes instead of the enum. Once there are no system wide faults anymore, this code will simplify back to something like it was originally.
sim/faults.cc:
This allocates the system wide faults.
sim/faults.hh:
This declares the system wide faults.
sim/syscall_emul.cc:
sim/syscall_emul.hh:
Removed the underscores from fault names.
--HG--
rename : arch/alpha/faults.cc => sim/faults.cc
rename : arch/alpha/faults.hh => sim/faults.hh
extra : convert_revision : 253d39258237333ae8ec4d8047367cb3ea68569d
2006-02-16 07:22:51 +01:00
|
|
|
return NoFault;
|
2005-06-05 07:22:21 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Uart8250::dataAvailable()
|
|
|
|
{
|
|
|
|
// if the kernel wants an interrupt when we have data
|
|
|
|
if (IER & UART_IER_RDI)
|
|
|
|
{
|
|
|
|
platform->postConsoleInt();
|
|
|
|
status |= RX_INT;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
Uart8250::serialize(ostream &os)
|
|
|
|
{
|
|
|
|
SERIALIZE_SCALAR(status);
|
|
|
|
SERIALIZE_SCALAR(IER);
|
|
|
|
SERIALIZE_SCALAR(DLAB);
|
|
|
|
SERIALIZE_SCALAR(LCR);
|
|
|
|
SERIALIZE_SCALAR(MCR);
|
|
|
|
Tick rxintrwhen;
|
|
|
|
if (rxIntrEvent.scheduled())
|
|
|
|
rxintrwhen = rxIntrEvent.when();
|
|
|
|
else
|
|
|
|
rxintrwhen = 0;
|
|
|
|
Tick txintrwhen;
|
|
|
|
if (txIntrEvent.scheduled())
|
|
|
|
txintrwhen = txIntrEvent.when();
|
|
|
|
else
|
|
|
|
txintrwhen = 0;
|
|
|
|
SERIALIZE_SCALAR(rxintrwhen);
|
|
|
|
SERIALIZE_SCALAR(txintrwhen);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Uart8250::unserialize(Checkpoint *cp, const std::string §ion)
|
|
|
|
{
|
|
|
|
UNSERIALIZE_SCALAR(status);
|
|
|
|
UNSERIALIZE_SCALAR(IER);
|
|
|
|
UNSERIALIZE_SCALAR(DLAB);
|
|
|
|
UNSERIALIZE_SCALAR(LCR);
|
|
|
|
UNSERIALIZE_SCALAR(MCR);
|
|
|
|
Tick rxintrwhen;
|
|
|
|
Tick txintrwhen;
|
|
|
|
UNSERIALIZE_SCALAR(rxintrwhen);
|
|
|
|
UNSERIALIZE_SCALAR(txintrwhen);
|
|
|
|
if (rxintrwhen != 0)
|
|
|
|
rxIntrEvent.schedule(rxintrwhen);
|
|
|
|
if (txintrwhen != 0)
|
|
|
|
txIntrEvent.schedule(txintrwhen);
|
|
|
|
}
|
|
|
|
|
|
|
|
BEGIN_DECLARE_SIM_OBJECT_PARAMS(Uart8250)
|
|
|
|
|
|
|
|
SimObjectParam<SimConsole *> console;
|
|
|
|
SimObjectParam<MemoryController *> mmu;
|
|
|
|
SimObjectParam<Platform *> platform;
|
|
|
|
Param<Addr> addr;
|
|
|
|
Param<Addr> size;
|
2005-11-20 22:57:53 +01:00
|
|
|
SimObjectParam<Bus*> pio_bus;
|
2005-06-05 07:22:21 +02:00
|
|
|
Param<Tick> pio_latency;
|
|
|
|
SimObjectParam<HierParams *> hier;
|
|
|
|
|
|
|
|
|
|
|
|
END_DECLARE_SIM_OBJECT_PARAMS(Uart8250)
|
|
|
|
|
|
|
|
BEGIN_INIT_SIM_OBJECT_PARAMS(Uart8250)
|
|
|
|
|
|
|
|
INIT_PARAM(console, "The console"),
|
|
|
|
INIT_PARAM(mmu, "Memory Controller"),
|
|
|
|
INIT_PARAM(platform, "Pointer to platfrom"),
|
|
|
|
INIT_PARAM(addr, "Device Address"),
|
|
|
|
INIT_PARAM_DFLT(size, "Device size", 0x8),
|
2005-11-20 22:57:53 +01:00
|
|
|
INIT_PARAM(pio_bus, ""),
|
2005-06-05 07:22:21 +02:00
|
|
|
INIT_PARAM_DFLT(pio_latency, "Programmed IO latency in bus cycles", 1),
|
|
|
|
INIT_PARAM_DFLT(hier, "Hierarchy global variables", &defaultHierParams)
|
|
|
|
|
|
|
|
END_INIT_SIM_OBJECT_PARAMS(Uart8250)
|
|
|
|
|
|
|
|
CREATE_SIM_OBJECT(Uart8250)
|
|
|
|
{
|
2005-11-20 22:57:53 +01:00
|
|
|
return new Uart8250(getInstanceName(), console, mmu, addr, size, hier,
|
|
|
|
pio_bus, pio_latency, platform);
|
2005-06-05 07:22:21 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
REGISTER_SIM_OBJECT("Uart8250", Uart8250)
|