derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fastmodel: Fix for the new gem5 namespace.

Browse Source 
Change-Id: Iacb6291e6ee93aecf5208d283eab9c1b5938bb2b
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/49617
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Gabe Black
2021-08-27 00:02:40 -07:00
committed by Gabe Black
parent 548987217f
commit 28314ace87
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/arch/arm/fastmodel/CortexA76/FastModelCortexA76.py
View File

@@ -366,8 +366,8 @@ class FastModelCortexA76Cluster(SimObject):
class FastModelScxEvsCortexA76x1(SystemC_ScModule):
type = 'FastModelScxEvsCortexA76x1'
cxx_class = \
'gem5::fastmodel::ScxEvsCortexA76<fastmodel::ScxEvsCortexA76x1Types>'
cxx_class = 'gem5::fastmodel::ScxEvsCortexA76<' \
'gem5::fastmodel::ScxEvsCortexA76x1Types>'
cxx_template_params = [ 'class Types' ]
cxx_header = 'arch/arm/fastmodel/CortexA76/evs.hh'
@@ -378,8 +378,8 @@ class FastModelCortexA76x1(FastModelCortexA76Cluster):
class FastModelScxEvsCortexA76x2(SystemC_ScModule):
type = 'FastModelScxEvsCortexA76x2'
cxx_class = \
'gem5::fastmodel::ScxEvsCortexA76<fastmodel::ScxEvsCortexA76x2Types>'
cxx_class = 'gem5::fastmodel::ScxEvsCortexA76<' \
'gem5::fastmodel::ScxEvsCortexA76x2Types>'
cxx_template_params = [ 'class Types' ]
cxx_header = 'arch/arm/fastmodel/CortexA76/evs.hh'
@@ -391,8 +391,8 @@ class FastModelCortexA76x2(FastModelCortexA76Cluster):
class FastModelScxEvsCortexA76x3(SystemC_ScModule):
type = 'FastModelScxEvsCortexA76x3'
cxx_class = \
'gem5::fastmodel::ScxEvsCortexA76<fastmodel::ScxEvsCortexA76x3Types>'
cxx_class = 'gem5::fastmodel::ScxEvsCortexA76<' \
'gem5::fastmodel::ScxEvsCortexA76x3Types>'
cxx_template_params = [ 'class Types' ]
cxx_header = 'arch/arm/fastmodel/CortexA76/evs.hh'
@@ -405,8 +405,8 @@ class FastModelCortexA76x3(FastModelCortexA76Cluster):
class FastModelScxEvsCortexA76x4(SystemC_ScModule):
type = 'FastModelScxEvsCortexA76x4'
cxx_class = \
'gem5::fastmodel::ScxEvsCortexA76<fastmodel::ScxEvsCortexA76x4Types>'
cxx_class = 'gem5::fastmodel::ScxEvsCortexA76<' \
'gem5::fastmodel::ScxEvsCortexA76x4Types>'
cxx_template_params = [ 'class Types' ]
cxx_header = 'arch/arm/fastmodel/CortexA76/evs.hh'

16
src/arch/arm/fastmodel/CortexR52/FastModelCortexR52.py
View File

@@ -171,8 +171,8 @@ class FastModelCortexR52Cluster(SimObject):
class FastModelScxEvsCortexR52x1(SystemC_ScModule):
type = 'FastModelScxEvsCortexR52x1'
cxx_class = \
'gem5::fastmodel::ScxEvsCortexR52<fastmodel::ScxEvsCortexR52x1Types>'
cxx_class = 'gem5::fastmodel::ScxEvsCortexR52<' \
'gem5::fastmodel::ScxEvsCortexR52x1Types>'
cxx_template_params = [ 'class Types' ]
cxx_header = 'arch/arm/fastmodel/CortexR52/evs.hh'
@@ -183,8 +183,8 @@ class FastModelCortexR52x1(FastModelCortexR52Cluster):
class FastModelScxEvsCortexR52x2(SystemC_ScModule):
type = 'FastModelScxEvsCortexR52x2'
cxx_class = \
'gem5::fastmodel::ScxEvsCortexR52<fastmodel::ScxEvsCortexR52x2Types>'
cxx_class = 'gem5::fastmodel::ScxEvsCortexR52<' \
'gem5::fastmodel::ScxEvsCortexR52x2Types>'
cxx_template_params = [ 'class Types' ]
cxx_header = 'arch/arm/fastmodel/CortexR52/evs.hh'
@@ -196,8 +196,8 @@ class FastModelCortexR52x2(FastModelCortexR52Cluster):
class FastModelScxEvsCortexR52x3(SystemC_ScModule):
type = 'FastModelScxEvsCortexR52x3'
cxx_class = \
'gem5::fastmodel::ScxEvsCortexR52<fastmodel::ScxEvsCortexR52x3Types>'
cxx_class = 'gem5::fastmodel::ScxEvsCortexR52<' \
'gem5::fastmodel::ScxEvsCortexR52x3Types>'
cxx_template_params = [ 'class Types' ]
cxx_header = 'arch/arm/fastmodel/CortexR52/evs.hh'
@@ -210,8 +210,8 @@ class FastModelCortexR52x3(FastModelCortexR52Cluster):
class FastModelScxEvsCortexR52x4(SystemC_ScModule):
type = 'FastModelScxEvsCortexR52x4'
cxx_class = \
'gem5::fastmodel::ScxEvsCortexR52<fastmodel::ScxEvsCortexR52x4Types>'
cxx_class = 'gem5::fastmodel::ScxEvsCortexR52<' \
'gem5::fastmodel::ScxEvsCortexR52x4Types>'
cxx_template_params = [ 'class Types' ]
cxx_header = 'arch/arm/fastmodel/CortexR52/evs.hh'

2
src/arch/arm/fastmodel/PL330_DMAC/pl330.cc
View File

@@ -223,7 +223,7 @@ PL330::allocateIrq(int idx, int count)
}
}
::Port &
gem5::Port &
PL330::gem5_getPort(const std::string &if_name, int idx)
{
if (if_name == "dma") {

4
src/arch/arm/fastmodel/protocol/ExportedClockRateControlProtocol.lisa
View File

@@ -36,8 +36,8 @@ protocol ExportedClockRateControl
description = "Exportable version of the clock rate control protocol.";
version = "1.0";
dso_safe = 0;
sc_slave_base_class_name = "ClockRateControlSlaveBase";
sc_slave_socket_class_name = "ClockRateControlTargetSocket";
sc_slave_base_class_name = "gem5::ClockRateControlSlaveBase";
sc_slave_socket_class_name = "gem5::ClockRateControlTargetSocket";
}
slave behavior set_mul_div(uint64_t mul, uint64_t div);

4
src/arch/arm/fastmodel/protocol/SignalInterruptProtocol.lisa
View File

@@ -36,8 +36,8 @@ protocol SignalInterrupt
description = "Signal an interrupt from gem5.";
version = "1.0";
dso_safe = 0;
sc_slave_base_class_name = "SignalInterruptSlaveBase";
sc_slave_socket_class_name = "SignalInterruptTargetSocket";
sc_slave_base_class_name = "gem5::SignalInterruptSlaveBase";
sc_slave_socket_class_name = "gem5::SignalInterruptTargetSocket";
}
slave behavior ppi(uint8_t cpu, uint32_t num, bool state);