[gem5-dev] Change in public/gem5[master]: sparc: Move the microop/macroop base classes out of the ISA desc.
Gabe Black has submitted this change and it was merged. ( https://gem5-review.googlesource.com/5481 ) Change subject: sparc: Move the microop/macroop base classes out of the ISA desc. .. sparc: Move the microop/macroop base classes out of the ISA desc. These were just raw C++ classes. Change-Id: Id2101400d885c6938efb6b94f2949722cfbb94ae Reviewed-on: https://gem5-review.googlesource.com/5481 Reviewed-by: Gabe BlackMaintainer: Gabe Black --- M src/arch/sparc/insts/SConscript A src/arch/sparc/insts/micro.cc A src/arch/sparc/insts/micro.hh M src/arch/sparc/isa/formats/formats.isa D src/arch/sparc/isa/formats/micro.isa M src/arch/sparc/isa/includes.isa 6 files changed, 172 insertions(+), 133 deletions(-) Approvals: Gabe Black: Looks good to me, approved; Looks good to me, approved diff --git a/src/arch/sparc/insts/SConscript b/src/arch/sparc/insts/SConscript index 24b7485..8848566 100644 --- a/src/arch/sparc/insts/SConscript +++ b/src/arch/sparc/insts/SConscript @@ -33,6 +33,7 @@ if env['TARGET_ISA'] == 'sparc': Source('branch.cc') +Source('micro.cc') Source('priv.cc') Source('static_inst.cc') Source('trap.cc') diff --git a/src/arch/sparc/insts/micro.cc b/src/arch/sparc/insts/micro.cc new file mode 100644 index 000..6415324 --- /dev/null +++ b/src/arch/sparc/insts/micro.cc @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2006-2007 The Regents of The University of Michigan + * 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. + * + * Authors: Gabe Black + */ + +#include "arch/sparc/insts/micro.hh" + +namespace SparcISA +{ + +std::string +SparcMacroInst::generateDisassembly(Addr pc, const SymbolTable *symtab) const +{ +std::stringstream response; +printMnemonic(response, mnemonic); +return response.str(); +} + +} diff --git a/src/arch/sparc/insts/micro.hh b/src/arch/sparc/insts/micro.hh new file mode 100644 index 000..d8c3adc --- /dev/null +++ b/src/arch/sparc/insts/micro.hh @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2006-2007 The Regents of The University of Michigan + * 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
[gem5-dev] Change in public/gem5[master]: sparc: Move the microop/macroop base classes out of the ISA desc.
Gabe Black has uploaded this change for review. ( https://gem5-review.googlesource.com/5481 Change subject: sparc: Move the microop/macroop base classes out of the ISA desc. .. sparc: Move the microop/macroop base classes out of the ISA desc. These were just raw C++ classes. Change-Id: Id2101400d885c6938efb6b94f2949722cfbb94ae --- M src/arch/sparc/insts/SConscript A src/arch/sparc/insts/micro.cc A src/arch/sparc/insts/micro.hh M src/arch/sparc/isa/formats/formats.isa D src/arch/sparc/isa/formats/micro.isa M src/arch/sparc/isa/includes.isa 6 files changed, 172 insertions(+), 133 deletions(-) diff --git a/src/arch/sparc/insts/SConscript b/src/arch/sparc/insts/SConscript index 24b7485..8848566 100644 --- a/src/arch/sparc/insts/SConscript +++ b/src/arch/sparc/insts/SConscript @@ -33,6 +33,7 @@ if env['TARGET_ISA'] == 'sparc': Source('branch.cc') +Source('micro.cc') Source('priv.cc') Source('static_inst.cc') Source('trap.cc') diff --git a/src/arch/sparc/insts/micro.cc b/src/arch/sparc/insts/micro.cc new file mode 100644 index 000..6415324 --- /dev/null +++ b/src/arch/sparc/insts/micro.cc @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2006-2007 The Regents of The University of Michigan + * 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. + * + * Authors: Gabe Black + */ + +#include "arch/sparc/insts/micro.hh" + +namespace SparcISA +{ + +std::string +SparcMacroInst::generateDisassembly(Addr pc, const SymbolTable *symtab) const +{ +std::stringstream response; +printMnemonic(response, mnemonic); +return response.str(); +} + +} diff --git a/src/arch/sparc/insts/micro.hh b/src/arch/sparc/insts/micro.hh new file mode 100644 index 000..d8c3adc --- /dev/null +++ b/src/arch/sparc/insts/micro.hh @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2006-2007 The Regents of The University of Michigan + * 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. + * + * Authors: Gabe Black + */ + +#ifndef