summaryrefslogtreecommitdiff
path: root/src/dev
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2012-09-19 06:15:44 -0400
committerAndreas Hansson <andreas.hansson@arm.com>2012-09-19 06:15:44 -0400
commitffb6aec603c38e16ae91ea975c16fc3e8fb337e5 (patch)
treefdf6e12bea9788f46589a9bcb15a8fe67581786f /src/dev
parentc34df76272c17401955f6daf30ca9c7e7671ae56 (diff)
downloadgem5-ffb6aec603c38e16ae91ea975c16fc3e8fb337e5.tar.xz
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
Diffstat (limited to 'src/dev')
-rw-r--r--src/dev/alpha/backdoor.hh1
-rw-r--r--src/dev/alpha/tsunami_cchip.hh1
-rw-r--r--src/dev/alpha/tsunami_io.hh1
-rw-r--r--src/dev/alpha/tsunami_pchip.hh1
-rw-r--r--src/dev/arm/a9scu.hh1
-rw-r--r--src/dev/arm/amba_device.hh1
-rw-r--r--src/dev/arm/amba_fake.hh1
-rw-r--r--src/dev/arm/gic.hh1
-rw-r--r--src/dev/arm/kmi.hh1
-rw-r--r--src/dev/arm/pl011.hh1
-rw-r--r--src/dev/arm/pl111.hh1
-rw-r--r--src/dev/arm/rtc_pl031.hh1
-rw-r--r--src/dev/arm/rv_ctrl.hh1
-rw-r--r--src/dev/arm/timer_cpulocal.hh1
-rw-r--r--src/dev/arm/timer_sp804.hh1
-rw-r--r--src/dev/baddev.hh1
-rw-r--r--src/dev/isa_fake.hh1
-rw-r--r--src/dev/mc146818.hh1
-rwxr-xr-xsrc/dev/mips/malta_cchip.hh1
-rwxr-xr-xsrc/dev/mips/malta_io.hh1
-rwxr-xr-xsrc/dev/mips/malta_pchip.hh1
-rw-r--r--src/dev/pciconfigall.hh1
-rw-r--r--src/dev/sparc/dtod.hh1
-rw-r--r--src/dev/sparc/iob.hh1
-rw-r--r--src/dev/sparc/mm_disk.hh1
-rw-r--r--src/dev/uart.hh1
-rw-r--r--src/dev/uart8250.hh1
-rw-r--r--src/dev/x86/i82094aa.hh1
28 files changed, 0 insertions, 28 deletions
diff --git a/src/dev/alpha/backdoor.hh b/src/dev/alpha/backdoor.hh
index 2acaba9a3..b9d04c7c0 100644
--- a/src/dev/alpha/backdoor.hh
+++ b/src/dev/alpha/backdoor.hh
@@ -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"
diff --git a/src/dev/alpha/tsunami_cchip.hh b/src/dev/alpha/tsunami_cchip.hh
index 1265c2e80..e9aca5d5c 100644
--- a/src/dev/alpha/tsunami_cchip.hh
+++ b/src/dev/alpha/tsunami_cchip.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"
diff --git a/src/dev/alpha/tsunami_io.hh b/src/dev/alpha/tsunami_io.hh
index f88cf5a6c..212e2a3d5 100644
--- a/src/dev/alpha/tsunami_io.hh
+++ b/src/dev/alpha/tsunami_io.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"
diff --git a/src/dev/alpha/tsunami_pchip.hh b/src/dev/alpha/tsunami_pchip.hh
index d31a28dbe..3e32db989 100644
--- a/src/dev/alpha/tsunami_pchip.hh
+++ b/src/dev/alpha/tsunami_pchip.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"
diff --git a/src/dev/arm/a9scu.hh b/src/dev/arm/a9scu.hh
index 881401ca6..10428d91e 100644
--- a/src/dev/arm/a9scu.hh
+++ b/src/dev/arm/a9scu.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"
diff --git a/src/dev/arm/amba_device.hh b/src/dev/arm/amba_device.hh
index 4bea1e075..92dfed541 100644
--- a/src/dev/arm/amba_device.hh
+++ b/src/dev/arm/amba_device.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"
diff --git a/src/dev/arm/amba_fake.hh b/src/dev/arm/amba_fake.hh
index 4a67ab9d5..24b326e8a 100644
--- a/src/dev/arm/amba_fake.hh
+++ b/src/dev/arm/amba_fake.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"
diff --git a/src/dev/arm/gic.hh b/src/dev/arm/gic.hh
index 9d93bbedf..02448f651 100644
--- a/src/dev/arm/gic.hh
+++ b/src/dev/arm/gic.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"
diff --git a/src/dev/arm/kmi.hh b/src/dev/arm/kmi.hh
index dc488ccce..e769a8a46 100644
--- a/src/dev/arm/kmi.hh
+++ b/src/dev/arm/kmi.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"
diff --git a/src/dev/arm/pl011.hh b/src/dev/arm/pl011.hh
index ddfd8305b..dbd8bd539 100644
--- a/src/dev/arm/pl011.hh
+++ b/src/dev/arm/pl011.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"
diff --git a/src/dev/arm/pl111.hh b/src/dev/arm/pl111.hh
index 599d4fa3e..5776f199c 100644
--- a/src/dev/arm/pl111.hh
+++ b/src/dev/arm/pl111.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"
diff --git a/src/dev/arm/rtc_pl031.hh b/src/dev/arm/rtc_pl031.hh
index f5615dd55..0f1929d29 100644
--- a/src/dev/arm/rtc_pl031.hh
+++ b/src/dev/arm/rtc_pl031.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"
diff --git a/src/dev/arm/rv_ctrl.hh b/src/dev/arm/rv_ctrl.hh
index cf14f6bcd..c6cf40f96 100644
--- a/src/dev/arm/rv_ctrl.hh
+++ b/src/dev/arm/rv_ctrl.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"
diff --git a/src/dev/arm/timer_cpulocal.hh b/src/dev/arm/timer_cpulocal.hh
index 144e0b807..cf7e46496 100644
--- a/src/dev/arm/timer_cpulocal.hh
+++ b/src/dev/arm/timer_cpulocal.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"
diff --git a/src/dev/arm/timer_sp804.hh b/src/dev/arm/timer_sp804.hh
index afb6e29ed..9f137001d 100644
--- a/src/dev/arm/timer_sp804.hh
+++ b/src/dev/arm/timer_sp804.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"
diff --git a/src/dev/baddev.hh b/src/dev/baddev.hh
index 9cf592c0e..ea902152e 100644
--- a/src/dev/baddev.hh
+++ b/src/dev/baddev.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"
diff --git a/src/dev/isa_fake.hh b/src/dev/isa_fake.hh
index 07657ad7d..1223e3b22 100644
--- a/src/dev/isa_fake.hh
+++ b/src/dev/isa_fake.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"
diff --git a/src/dev/mc146818.hh b/src/dev/mc146818.hh
index 576c4ab9f..c2f1e2dd8 100644
--- a/src/dev/mc146818.hh
+++ b/src/dev/mc146818.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) */
diff --git a/src/dev/mips/malta_cchip.hh b/src/dev/mips/malta_cchip.hh
index 4841551c4..9a17f632f 100755
--- a/src/dev/mips/malta_cchip.hh
+++ b/src/dev/mips/malta_cchip.hh
@@ -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"
diff --git a/src/dev/mips/malta_io.hh b/src/dev/mips/malta_io.hh
index 38da5adea..9311d7c22 100755
--- a/src/dev/mips/malta_io.hh
+++ b/src/dev/mips/malta_io.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"
diff --git a/src/dev/mips/malta_pchip.hh b/src/dev/mips/malta_pchip.hh
index a554e253e..a6145515a 100755
--- a/src/dev/mips/malta_pchip.hh
+++ b/src/dev/mips/malta_pchip.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"
diff --git a/src/dev/pciconfigall.hh b/src/dev/pciconfigall.hh
index eb480ad16..4df36f0b3 100644
--- a/src/dev/pciconfigall.hh
+++ b/src/dev/pciconfigall.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"
diff --git a/src/dev/sparc/dtod.hh b/src/dev/sparc/dtod.hh
index 325bce90a..a5b2dfaff 100644
--- a/src/dev/sparc/dtod.hh
+++ b/src/dev/sparc/dtod.hh
@@ -38,7 +38,6 @@
#include <vector>
-#include "base/range.hh"
#include "dev/io_device.hh"
#include "params/DumbTOD.hh"
diff --git a/src/dev/sparc/iob.hh b/src/dev/sparc/iob.hh
index b92d3cb2a..fc5e61092 100644
--- a/src/dev/sparc/iob.hh
+++ b/src/dev/sparc/iob.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"
diff --git a/src/dev/sparc/mm_disk.hh b/src/dev/sparc/mm_disk.hh
index 0e43449a1..d14e1d4a4 100644
--- a/src/dev/sparc/mm_disk.hh
+++ b/src/dev/sparc/mm_disk.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"
diff --git a/src/dev/uart.hh b/src/dev/uart.hh
index ba10c204c..eac70bf1f 100644
--- a/src/dev/uart.hh
+++ b/src/dev/uart.hh
@@ -35,7 +35,6 @@
#ifndef __UART_HH__
#define __UART_HH__
-#include "base/range.hh"
#include "dev/io_device.hh"
#include "params/Uart.hh"
diff --git a/src/dev/uart8250.hh b/src/dev/uart8250.hh
index e2fb043c1..7d577954c 100644
--- a/src/dev/uart8250.hh
+++ b/src/dev/uart8250.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"
diff --git a/src/dev/x86/i82094aa.hh b/src/dev/x86/i82094aa.hh
index c90a5b812..76a8f9c00 100644
--- a/src/dev/x86/i82094aa.hh
+++ b/src/dev/x86/i82094aa.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"