AddrRange: Transition from Range<T> to AddrRange
This patch takes the final plunge and transitions from the templated Range class to the more specific AddrRange. In doing so it changes the obvious Range<Addr> to AddrRange, and also bumps the range_map to be AddrRangeMap. In addition to the obvious changes, including the removal of redundant includes, this patch also does some house keeping in preparing for the introduction of address interleaving support in the ranges. The Range class is also stripped of all the functionality that is never used. --HG-- rename : src/base/range.hh => src/base/addr_range.hh rename : src/base/range_map.hh => src/base/addr_range_map.hh
This commit is contained in:
@@ -35,7 +35,6 @@
|
||||
#ifndef __DEV_ALPHA_BACKDOOR_HH__
|
||||
#define __DEV_ALPHA_BACKDOOR_HH__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "base/types.hh"
|
||||
#include "dev/alpha/access.h"
|
||||
#include "dev/io_device.hh"
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
#ifndef __TSUNAMI_CCHIP_HH__
|
||||
#define __TSUNAMI_CCHIP_HH__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/alpha/tsunami.hh"
|
||||
#include "dev/io_device.hh"
|
||||
#include "params/TsunamiCChip.hh"
|
||||
|
||||
@@ -37,7 +37,6 @@
|
||||
#ifndef __DEV_TSUNAMI_IO_HH__
|
||||
#define __DEV_TSUNAMI_IO_HH__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/alpha/tsunami.hh"
|
||||
#include "dev/intel_8254_timer.hh"
|
||||
#include "dev/io_device.hh"
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
#ifndef __TSUNAMI_PCHIP_HH__
|
||||
#define __TSUNAMI_PCHIP_HH__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/alpha/tsunami.hh"
|
||||
#include "dev/io_device.hh"
|
||||
#include "params/TsunamiPChip.hh"
|
||||
|
||||
@@ -40,7 +40,6 @@
|
||||
#ifndef __DEV_ARM_A9SCU_HH__
|
||||
#define __DEV_ARM_A9SCU_HH__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/io_device.hh"
|
||||
#include "params/A9SCU.hh"
|
||||
|
||||
|
||||
@@ -49,7 +49,6 @@
|
||||
#ifndef __DEV_ARM_AMBA_DEVICE_HH__
|
||||
#define __DEV_ARM_AMBA_DEVICE_HH__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/arm/gic.hh"
|
||||
#include "dev/dma_device.hh"
|
||||
#include "dev/io_device.hh"
|
||||
|
||||
@@ -51,7 +51,6 @@
|
||||
#ifndef __DEV_ARM_AMBA_FAKE_H__
|
||||
#define __DEV_ARM_AMBA_FAKE_H__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/arm/amba_device.hh"
|
||||
#include "params/AmbaFake.hh"
|
||||
|
||||
|
||||
@@ -49,7 +49,6 @@
|
||||
#define __DEV_ARM_GIC_H__
|
||||
|
||||
#include "base/bitunion.hh"
|
||||
#include "base/range.hh"
|
||||
#include "dev/io_device.hh"
|
||||
#include "dev/platform.hh"
|
||||
#include "cpu/intr_control.hh"
|
||||
|
||||
@@ -51,7 +51,6 @@
|
||||
#include <list>
|
||||
|
||||
#include "base/vnc/vncserver.hh"
|
||||
#include "base/range.hh"
|
||||
#include "dev/arm/amba_device.hh"
|
||||
#include "params/Pl050.hh"
|
||||
|
||||
|
||||
@@ -48,7 +48,6 @@
|
||||
#ifndef __DEV_ARM_PL011_H__
|
||||
#define __DEV_ARM_PL011_H__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/io_device.hh"
|
||||
#include "dev/uart.hh"
|
||||
#include "params/Pl011.hh"
|
||||
|
||||
@@ -48,7 +48,6 @@
|
||||
|
||||
#include <fstream>
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/arm/amba_device.hh"
|
||||
#include "params/Pl111.hh"
|
||||
#include "sim/serialize.hh"
|
||||
|
||||
@@ -40,7 +40,6 @@
|
||||
#ifndef __DEV_ARM_RTC_PL310_HH__
|
||||
#define __DEV_ARM_RTC_PL310_HH__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/arm/amba_device.hh"
|
||||
#include "params/PL031.hh"
|
||||
|
||||
|
||||
@@ -41,7 +41,6 @@
|
||||
#define __DEV_ARM_RV_HH__
|
||||
|
||||
#include "base/bitunion.hh"
|
||||
#include "base/range.hh"
|
||||
#include "dev/io_device.hh"
|
||||
#include "params/RealViewCtrl.hh"
|
||||
|
||||
|
||||
@@ -41,7 +41,6 @@
|
||||
#ifndef __DEV_ARM_LOCALTIMER_HH__
|
||||
#define __DEV_ARM_LOCALTIMER_HH__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/io_device.hh"
|
||||
#include "params/CpuLocalTimer.hh"
|
||||
|
||||
|
||||
@@ -40,7 +40,6 @@
|
||||
#ifndef __DEV_ARM_SP804_HH__
|
||||
#define __DEV_ARM_SP804_HH__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/arm/amba_device.hh"
|
||||
#include "params/Sp804.hh"
|
||||
|
||||
|
||||
@@ -36,7 +36,6 @@
|
||||
#ifndef __DEV_BADDEV_HH__
|
||||
#define __DEV_BADDEV_HH__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/io_device.hh"
|
||||
#include "params/BadDevice.hh"
|
||||
|
||||
|
||||
@@ -37,7 +37,6 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/io_device.hh"
|
||||
// #include "dev/alpha/tsunami.hh"
|
||||
#include "mem/packet.hh"
|
||||
|
||||
@@ -33,7 +33,6 @@
|
||||
#ifndef __DEV_MC146818_HH__
|
||||
#define __DEV_MC146818_HH__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "sim/eventq.hh"
|
||||
|
||||
/** Real-Time Clock (MC146818) */
|
||||
|
||||
@@ -36,7 +36,6 @@
|
||||
#ifndef __MALTA_CCHIP_HH__
|
||||
#define __MALTA_CCHIP_HH__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/mips/malta.hh"
|
||||
#include "dev/io_device.hh"
|
||||
#include "params/MaltaCChip.hh"
|
||||
|
||||
@@ -37,7 +37,6 @@
|
||||
#ifndef __DEV_MALTA_IO_HH__
|
||||
#define __DEV_MALTA_IO_HH__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/mips/malta.hh"
|
||||
#include "dev/intel_8254_timer.hh"
|
||||
#include "dev/io_device.hh"
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
#ifndef __MALTA_PCHIP_HH__
|
||||
#define __MALTA_PCHIP_HH__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/mips/malta.hh"
|
||||
#include "dev/io_device.hh"
|
||||
#include "params/MaltaPChip.hh"
|
||||
|
||||
@@ -37,7 +37,6 @@
|
||||
#ifndef __PCICONFIGALL_HH__
|
||||
#define __PCICONFIGALL_HH__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/io_device.hh"
|
||||
#include "dev/pcireg.h"
|
||||
#include "params/PciConfigAll.hh"
|
||||
|
||||
@@ -38,7 +38,6 @@
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/io_device.hh"
|
||||
#include "params/DumbTOD.hh"
|
||||
|
||||
|
||||
@@ -36,7 +36,6 @@
|
||||
#ifndef __DEV_SPARC_IOB_HH__
|
||||
#define __DEV_SPARC_IOB_HH__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/disk_image.hh"
|
||||
#include "dev/io_device.hh"
|
||||
#include "params/Iob.hh"
|
||||
|
||||
@@ -36,7 +36,6 @@
|
||||
#ifndef __DEV_SPARC_MM_DISK_HH__
|
||||
#define __DEV_SPARC_MM_DISK_HH__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/disk_image.hh"
|
||||
#include "dev/io_device.hh"
|
||||
#include "params/MmDisk.hh"
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
#ifndef __UART_HH__
|
||||
#define __UART_HH__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/io_device.hh"
|
||||
#include "params/Uart.hh"
|
||||
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
#ifndef __DEV_UART8250_HH__
|
||||
#define __DEV_UART8250_HH__
|
||||
|
||||
#include "base/range.hh"
|
||||
#include "dev/io_device.hh"
|
||||
#include "dev/uart.hh"
|
||||
#include "params/Uart8250.hh"
|
||||
|
||||
@@ -34,7 +34,6 @@
|
||||
#include <map>
|
||||
|
||||
#include "base/bitunion.hh"
|
||||
#include "base/range_map.hh"
|
||||
#include "dev/x86/intdev.hh"
|
||||
#include "dev/io_device.hh"
|
||||
#include "params/I82094AA.hh"
|
||||
|
||||
Reference in New Issue
Block a user