From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12652 invoked by alias); 3 Feb 2009 02:19:37 -0000 Received: (qmail 12599 invoked by uid 22791); 3 Feb 2009 02:19:18 -0000 X-SWARE-Spam-Status: No, hits=0.8 required=5.0 tests=AWL,BAYES_50,HK_OBFDOM,J_CHICKENPOX_32,J_CHICKENPOX_33,J_CHICKENPOX_53,J_CHICKENPOX_62,J_CHICKENPOX_63,J_CHICKENPOX_93,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mx2.redhat.com (HELO mx2.redhat.com) (66.187.237.31) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 03 Feb 2009 02:18:52 +0000 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n132IoW0023812 for ; Mon, 2 Feb 2009 21:18:50 -0500 Received: from greed.delorie.com (vpn-12-20.rdu.redhat.com [10.11.12.20]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n132ImBi012730 for ; Mon, 2 Feb 2009 21:18:49 -0500 Received: from greed.delorie.com (greed.delorie.com [127.0.0.1] (may be forged)) by greed.delorie.com (8.14.3/8.14.3) with ESMTP id n132IlEP023694 for ; Mon, 2 Feb 2009 21:18:47 -0500 Received: (from dj@localhost) by greed.delorie.com (8.14.3/8.14.3/Submit) id n132Il63023691; Mon, 2 Feb 2009 21:18:47 -0500 Date: Tue, 03 Feb 2009 02:19:00 -0000 Message-Id: <200902030218.n132Il63023691@greed.delorie.com> From: DJ Delorie To: sid@sourceware.org Subject: [mep] configuration regen Mailing-List: contact sid-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: sid-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg00004.txt.bz2 Toshiba has requested a new default configuration. This is a regen of affected files. Ok to apply? Index: sid/component/cgen-cpu/ChangeLog =================================================================== RCS file: /cvs/src/src/sid/component/cgen-cpu/ChangeLog,v retrieving revision 1.81 diff -p -U3 -r1.81 sid/component/cgen-cpu/ChangeLog --- sid/component/cgen-cpu/ChangeLog 5 Feb 2007 20:28:39 -0000 1.81 +++ sid/component/cgen-cpu/ChangeLog 3 Feb 2009 01:53:50 -0000 @@ -1,3 +1,7 @@ +2009-02-02 DJ Delorie + + * compCGEN.cxx: Update to new MeP configuration. + 2007-02-05 Dave Brolley * Contribute the following changes: Index: sid/component/cgen-cpu/compCGEN.cxx =================================================================== RCS file: /cvs/src/src/sid/component/cgen-cpu/compCGEN.cxx,v retrieving revision 1.22 diff -p -U3 -r1.22 sid/component/cgen-cpu/compCGEN.cxx --- sid/component/cgen-cpu/compCGEN.cxx 5 Feb 2007 20:28:39 -0000 1.22 +++ sid/component/cgen-cpu/compCGEN.cxx 3 Feb 2009 01:53:50 -0000 @@ -30,7 +30,6 @@ extern "C" { #include "mep_basic.h" // begin-mep-includes #include "mep_ext1.h" -#include "mep_ext2.h" // end-mep-includes #endif #if SIDTARGET_MT @@ -331,7 +330,6 @@ compCGENListTypes () types.push_back ("hw-cpu-mep"); // begin-mep-types types.push_back ("hw-cpu-mep-ext1"); - types.push_back ("hw-cpu-mep-ext2"); // end-mep-types #endif #if SIDTARGET_MT @@ -383,8 +381,6 @@ compCGENCreate (const string& typeName) // begin-mep-constructors if (typeName == "hw-cpu-mep-ext1") return new mep_ext1::mep_ext1_cpu (); - if (typeName == "hw-cpu-mep-ext2") - return new mep_ext2::mep_ext2_cpu (); // end-mep-constructors #endif #if SIDTARGET_MT Index: sid/component/cgen-cpu/mep/ChangeLog =================================================================== RCS file: /cvs/src/src/sid/component/cgen-cpu/mep/ChangeLog,v retrieving revision 1.2 diff -p -U3 -r1.2 sid/component/cgen-cpu/mep/ChangeLog --- sid/component/cgen-cpu/mep/ChangeLog 13 Aug 2007 14:47:43 -0000 1.2 +++ sid/component/cgen-cpu/mep/ChangeLog 3 Feb 2009 01:53:51 -0000 @@ -1,3 +1,14 @@ +2009-02-02 DJ Delorie + + * Makefile.am: Update to new MeP configuration. + * Makefile.in: Likewise. + * common_model.cxx: Likewise. + * mep-core1-decode.cxx: Likewise. + * mep-cpu.h: Likewise. + * mep-decode.cxx: Likewise. + * mep-desc.h: Likewise. + * mep.h: Likewise. + 2007-08-13 Frank Ch. Eigler * common_model.h: Change #include guard name. Index: sid/component/cgen-cpu/mep/Makefile.am =================================================================== RCS file: /cvs/src/src/sid/component/cgen-cpu/mep/Makefile.am,v retrieving revision 1.1 diff -p -U3 -r1.1 sid/component/cgen-cpu/mep/Makefile.am --- sid/component/cgen-cpu/mep/Makefile.am 5 Feb 2007 20:28:39 -0000 1.1 +++ sid/component/cgen-cpu/mep/Makefile.am 3 Feb 2009 01:53:51 -0000 @@ -11,7 +11,7 @@ CXXFLAGS = $(TOP_CXXFLAGS) -DHAVE_CONFIG pkgdata_DATA = hw-cpu-mep.txt -CPU_SOURCES = mep-core1-decode.cxx mep-core1-sem.cxx mep-core1-model.cxx mep-core2-decode.cxx mep-core2-sem.cxx mep-core2-model.cxx mep-cop2-16-decode.cxx mep-cop2-16-sem.cxx mep-cop2-16-model.cxx mep-cop2-32-decode.cxx mep-cop2-32-sem.cxx mep-cop2-32-model.cxx mep-cop2-48-decode.cxx mep-cop2-48-sem.cxx mep-cop2-48-model.cxx mep-cop2-64-decode.cxx mep-cop2-64-sem.cxx mep-cop2-64-model.cxx fmax-fp.cxx fmax-fpu.cxx +CPU_SOURCES = mep-core1-decode.cxx mep-core1-sem.cxx mep-core1-model.cxx libmep_la_SOURCES = mep.cxx common_model.cxx mep-decode.cxx mep-sem.cxx mep-model.cxx $(CPU_SOURCES) libmep_la_LDFLAGS = @@ -57,9 +57,9 @@ CGENDEPS = ../../../../cgen/stamp-cgen \ $(cgendir)/sim-test.scm $(cgendir)/sim-cpu.scm \ $(cgendir)/sim-model.scm $(cgendir)/sim.scm -CPU_TARGETS = mep-core1 mep-core2 mep-cop2-16 mep-cop2-32 mep-cop2-48 mep-cop2-64 +CPU_TARGETS = mep-core1 -CPU_LIST = mep,ext_core1,ext_core2,ext_cop2_16,ext_cop2_32,ext_cop2_48,ext_cop2_64 +CPU_LIST = mep,ext_core1 CGEN_TARGETS = mep-cpudesc mep-decsemdefs $(CPU_TARGETS) .PHONY: $(CGEN_TARGETS) @@ -73,31 +73,6 @@ mep-core1: mep "with-multiple-isa with-scache with-profile=fn" mep_ext1 ext_core1 $(CGEN_MACH) mepcore1 "mep-core1-" \ $(cgendir)/cpu/mep.cpu \ "decode.h decode.cxx model.h model.cxx semantics.cxx defs.h" -mep-core2: - $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ - mep "with-multiple-isa with-scache with-profile=fn" mep_ext2 ext_core2 $(CGEN_MACH) mepcore2 "mep-core2-" \ - $(cgendir)/cpu/mep.cpu \ - "decode.h decode.cxx model.h model.cxx semantics.cxx defs.h" -mep-cop2-16: - $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ - mep "with-multiple-isa with-scache with-profile=fn" mep_ext2 ext_cop2_16 $(CGEN_MACH) mepcop2_16 "mep-cop2-16-" \ - $(cgendir)/cpu/mep.cpu \ - "decode.h decode.cxx model.h model.cxx semantics.cxx defs.h" -mep-cop2-32: - $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ - mep "with-multiple-isa with-scache with-profile=fn" mep_ext2 ext_cop2_32 $(CGEN_MACH) mepcop2_32 "mep-cop2-32-" \ - $(cgendir)/cpu/mep.cpu \ - "decode.h decode.cxx model.h model.cxx semantics.cxx defs.h" -mep-cop2-48: - $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ - mep "with-multiple-isa with-scache with-profile=fn" mep_ext2 ext_cop2_48 $(CGEN_MACH) mepcop2_48 "mep-cop2-48-" \ - $(cgendir)/cpu/mep.cpu \ - "decode.h decode.cxx model.h model.cxx semantics.cxx defs.h" -mep-cop2-64: - $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ - mep "with-multiple-isa with-scache with-profile=fn" mep_ext2 ext_cop2_64 $(CGEN_MACH) mepcop2_64 "mep-cop2-64-" \ - $(cgendir)/cpu/mep.cpu \ - "decode.h decode.cxx model.h model.cxx semantics.cxx defs.h" # end-cpus mep-cpudesc: $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ Index: sid/component/cgen-cpu/mep/Makefile.in =================================================================== RCS file: /cvs/src/src/sid/component/cgen-cpu/mep/Makefile.in,v retrieving revision 1.1 diff -p -U3 -r1.1 sid/component/cgen-cpu/mep/Makefile.in --- sid/component/cgen-cpu/mep/Makefile.in 5 Feb 2007 20:28:39 -0000 1.1 +++ sid/component/cgen-cpu/mep/Makefile.in 3 Feb 2009 01:53:51 -0000 @@ -74,13 +74,8 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libmep_la_DEPENDENCIES = mep-asm.lo mep-dis.lo mep-opc.lo mep-ibld.lo \ mep-desc.lo -am__objects_1 = mep-core1-decode.lo mep-core1-sem.lo \ - mep-core1-model.lo mep-core2-decode.lo mep-core2-sem.lo \ - mep-core2-model.lo mep-cop2-16-decode.lo mep-cop2-16-sem.lo \ - mep-cop2-16-model.lo mep-cop2-32-decode.lo mep-cop2-32-sem.lo \ - mep-cop2-32-model.lo mep-cop2-48-decode.lo mep-cop2-48-sem.lo \ - mep-cop2-48-model.lo mep-cop2-64-decode.lo mep-cop2-64-sem.lo \ - mep-cop2-64-model.lo fmax-fp.lo fmax-fpu.lo +am__objects_1 = \ +mep-core1-decode.lo mep-core1-sem.lo mep-core1-model.lo am_libmep_la_OBJECTS = mep.lo common_model.lo mep-decode.lo mep-sem.lo \ mep-model.lo $(am__objects_1) libmep_la_OBJECTS = $(am_libmep_la_OBJECTS) @@ -241,7 +236,7 @@ noinst_LTLIBRARIES = libmep.la BFDINCLUDES = -I../../../../bfd -I$(srcdir)/../../../../include INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I.. -I../../../include -I$(srcdir)/../../../include $(BFDINCLUDES) pkgdata_DATA = hw-cpu-mep.txt -CPU_SOURCES = mep-core1-decode.cxx mep-core1-sem.cxx mep-core1-model.cxx mep-core2-decode.cxx mep-core2-sem.cxx mep-core2-model.cxx mep-cop2-16-decode.cxx mep-cop2-16-sem.cxx mep-cop2-16-model.cxx mep-cop2-32-decode.cxx mep-cop2-32-sem.cxx mep-cop2-32-model.cxx mep-cop2-48-decode.cxx mep-cop2-48-sem.cxx mep-cop2-48-model.cxx mep-cop2-64-decode.cxx mep-cop2-64-sem.cxx mep-cop2-64-model.cxx fmax-fp.cxx fmax-fpu.cxx +CPU_SOURCES = mep-core1-decode.cxx mep-core1-sem.cxx mep-core1-model.cxx libmep_la_SOURCES = mep.cxx common_model.cxx mep-decode.cxx mep-sem.cxx mep-model.cxx $(CPU_SOURCES) libmep_la_LDFLAGS = libmep_la_LIBADD = mep-asm.lo mep-dis.lo mep-opc.lo mep-ibld.lo mep-desc.lo @@ -264,8 +259,8 @@ CGENDEPS = ../../../../cgen/stamp-cgen \ $(cgendir)/sim-test.scm $(cgendir)/sim-cpu.scm \ $(cgendir)/sim-model.scm $(cgendir)/sim.scm -CPU_TARGETS = mep-core1 mep-core2 mep-cop2-16 mep-cop2-32 mep-cop2-48 mep-cop2-64 -CPU_LIST = mep,ext_core1,ext_core2,ext_cop2_16,ext_cop2_32,ext_cop2_48,ext_cop2_64 +CPU_TARGETS = mep-core1 +CPU_LIST = mep,ext_core1 CGEN_TARGETS = mep-cpudesc mep-decsemdefs $(CPU_TARGETS) html_stylesheet = $(srcdir)/../../component_html.xsl SUFFIXES = .xml .txt .html @@ -325,26 +320,9 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common_model.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fmax-fp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fmax-fpu.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-cop2-16-decode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-cop2-16-model.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-cop2-16-sem.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-cop2-32-decode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-cop2-32-model.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-cop2-32-sem.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-cop2-48-decode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-cop2-48-model.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-cop2-48-sem.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-cop2-64-decode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-cop2-64-model.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-cop2-64-sem.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-core1-decode.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-core1-model.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-core1-sem.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-core2-decode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-core2-model.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-core2-sem.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-decode.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-model.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mep-sem.Plo@am__quote@ @@ -703,31 +681,6 @@ mep-core1: mep "with-multiple-isa with-scache with-profile=fn" mep_ext1 ext_core1 $(CGEN_MACH) mepcore1 "mep-core1-" \ $(cgendir)/cpu/mep.cpu \ "decode.h decode.cxx model.h model.cxx semantics.cxx defs.h" -mep-core2: - $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ - mep "with-multiple-isa with-scache with-profile=fn" mep_ext2 ext_core2 $(CGEN_MACH) mepcore2 "mep-core2-" \ - $(cgendir)/cpu/mep.cpu \ - "decode.h decode.cxx model.h model.cxx semantics.cxx defs.h" -mep-cop2-16: - $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ - mep "with-multiple-isa with-scache with-profile=fn" mep_ext2 ext_cop2_16 $(CGEN_MACH) mepcop2_16 "mep-cop2-16-" \ - $(cgendir)/cpu/mep.cpu \ - "decode.h decode.cxx model.h model.cxx semantics.cxx defs.h" -mep-cop2-32: - $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ - mep "with-multiple-isa with-scache with-profile=fn" mep_ext2 ext_cop2_32 $(CGEN_MACH) mepcop2_32 "mep-cop2-32-" \ - $(cgendir)/cpu/mep.cpu \ - "decode.h decode.cxx model.h model.cxx semantics.cxx defs.h" -mep-cop2-48: - $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ - mep "with-multiple-isa with-scache with-profile=fn" mep_ext2 ext_cop2_48 $(CGEN_MACH) mepcop2_48 "mep-cop2-48-" \ - $(cgendir)/cpu/mep.cpu \ - "decode.h decode.cxx model.h model.cxx semantics.cxx defs.h" -mep-cop2-64: - $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ - mep "with-multiple-isa with-scache with-profile=fn" mep_ext2 ext_cop2_64 $(CGEN_MACH) mepcop2_64 "mep-cop2-64-" \ - $(cgendir)/cpu/mep.cpu \ - "decode.h decode.cxx model.h model.cxx semantics.cxx defs.h" # end-cpus mep-cpudesc: $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ Index: sid/component/cgen-cpu/mep/common_model.cxx =================================================================== RCS file: /cvs/src/src/sid/component/cgen-cpu/mep/common_model.cxx,v retrieving revision 1.1 diff -p -U3 -r1.1 sid/component/cgen-cpu/mep/common_model.cxx --- sid/component/cgen-cpu/mep/common_model.cxx 5 Feb 2007 20:28:40 -0000 1.1 +++ sid/component/cgen-cpu/mep/common_model.cxx 3 Feb 2009 01:53:51 -0000 @@ -10,14 +10,12 @@ #include "mep_basic.h" // begin-includes #include "mep_ext1.h" -#include "mep_ext2.h" // end-includes using namespace cgen; using namespace mep_basic; // begin-namespaces using namespace mep_ext1; -using namespace mep_ext2; // end-namespaces // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -40,11 +38,6 @@ mep_common_model::model_u_ldcb_before (mep_basic_cpu *, const mep_idesc *, int unit_num); template UINT mep_common_model::model_u_ldcb_before (mep_ext1_cpu *, const mepcore1_idesc *, int unit_num); -template UINT mep_common_model::model_u_ldcb_before (mep_ext2_cpu *, const mepcore2_idesc *, int unit_num); -template UINT mep_common_model::model_u_ldcb_before (mep_ext2_cpu *, const mepcop2_16_idesc *, int unit_num); -template UINT mep_common_model::model_u_ldcb_before (mep_ext2_cpu *, const mepcop2_32_idesc *, int unit_num); -template UINT mep_common_model::model_u_ldcb_before (mep_ext2_cpu *, const mepcop2_48_idesc *, int unit_num); -template UINT mep_common_model::model_u_ldcb_before (mep_ext2_cpu *, const mepcop2_64_idesc *, int unit_num); // end-generated-instantiations template @@ -59,11 +52,6 @@ mep_common_model::model_u_divide_before (mep_basic_cpu *, const mep_idesc *, int unit_num); template UINT mep_common_model::model_u_divide_before (mep_ext1_cpu *, const mepcore1_idesc *, int unit_num); -template UINT mep_common_model::model_u_divide_before (mep_ext2_cpu *, const mepcore2_idesc *, int unit_num); -template UINT mep_common_model::model_u_divide_before (mep_ext2_cpu *, const mepcop2_16_idesc *, int unit_num); -template UINT mep_common_model::model_u_divide_before (mep_ext2_cpu *, const mepcop2_32_idesc *, int unit_num); -template UINT mep_common_model::model_u_divide_before (mep_ext2_cpu *, const mepcop2_48_idesc *, int unit_num); -template UINT mep_common_model::model_u_divide_before (mep_ext2_cpu *, const mepcop2_64_idesc *, int unit_num); // end-generated-instantiations template @@ -78,11 +66,6 @@ mep_common_model::model_u_multiply_before (mep_basic_cpu *, const mep_idesc *, int unit_num); template UINT mep_common_model::model_u_multiply_before (mep_ext1_cpu *, const mepcore1_idesc *, int unit_num); -template UINT mep_common_model::model_u_multiply_before (mep_ext2_cpu *, const mepcore2_idesc *, int unit_num); -template UINT mep_common_model::model_u_multiply_before (mep_ext2_cpu *, const mepcop2_16_idesc *, int unit_num); -template UINT mep_common_model::model_u_multiply_before (mep_ext2_cpu *, const mepcop2_32_idesc *, int unit_num); -template UINT mep_common_model::model_u_multiply_before (mep_ext2_cpu *, const mepcop2_48_idesc *, int unit_num); -template UINT mep_common_model::model_u_multiply_before (mep_ext2_cpu *, const mepcop2_64_idesc *, int unit_num); // end-generated-instantiations template @@ -97,11 +80,6 @@ mep_common_model::model_u_use_ctrl_reg_before (mep_basic_cpu *, const mep_idesc *, int unit_num, INT usereg); template UINT mep_common_model::model_u_use_ctrl_reg_before (mep_ext1_cpu *, const mepcore1_idesc *, int unit_num, INT usereg); -template UINT mep_common_model::model_u_use_ctrl_reg_before (mep_ext2_cpu *, const mepcore2_idesc *, int unit_num, INT usereg); -template UINT mep_common_model::model_u_use_ctrl_reg_before (mep_ext2_cpu *, const mepcop2_16_idesc *, int unit_num, INT usereg); -template UINT mep_common_model::model_u_use_ctrl_reg_before (mep_ext2_cpu *, const mepcop2_32_idesc *, int unit_num, INT usereg); -template UINT mep_common_model::model_u_use_ctrl_reg_before (mep_ext2_cpu *, const mepcop2_48_idesc *, int unit_num, INT usereg); -template UINT mep_common_model::model_u_use_ctrl_reg_before (mep_ext2_cpu *, const mepcop2_64_idesc *, int unit_num, INT usereg); // end-generated-instantiations template @@ -117,11 +95,6 @@ mep_common_model::model_u_use_gpr_before (mep_basic_cpu *, const mep_idesc *, int unit_num, INT usereg); template UINT mep_common_model::model_u_use_gpr_before (mep_ext1_cpu *, const mepcore1_idesc *, int unit_num, INT usereg); -template UINT mep_common_model::model_u_use_gpr_before (mep_ext2_cpu *, const mepcore2_idesc *, int unit_num, INT usereg); -template UINT mep_common_model::model_u_use_gpr_before (mep_ext2_cpu *, const mepcop2_16_idesc *, int unit_num, INT usereg); -template UINT mep_common_model::model_u_use_gpr_before (mep_ext2_cpu *, const mepcop2_32_idesc *, int unit_num, INT usereg); -template UINT mep_common_model::model_u_use_gpr_before (mep_ext2_cpu *, const mepcop2_48_idesc *, int unit_num, INT usereg); -template UINT mep_common_model::model_u_use_gpr_before (mep_ext2_cpu *, const mepcop2_64_idesc *, int unit_num, INT usereg); // end-generated-instantiations template @@ -144,11 +117,6 @@ mep_common_model::model_u_branch_after (mep_basic_cpu *, const mep_idesc *, int unit_num, unsigned long long referenced); template UINT mep_common_model::model_u_branch_after (mep_ext1_cpu *, const mepcore1_idesc *, int unit_num, unsigned long long referenced); -template UINT mep_common_model::model_u_branch_after (mep_ext2_cpu *, const mepcore2_idesc *, int unit_num, unsigned long long referenced); -template UINT mep_common_model::model_u_branch_after (mep_ext2_cpu *, const mepcop2_16_idesc *, int unit_num, unsigned long long referenced); -template UINT mep_common_model::model_u_branch_after (mep_ext2_cpu *, const mepcop2_32_idesc *, int unit_num, unsigned long long referenced); -template UINT mep_common_model::model_u_branch_after (mep_ext2_cpu *, const mepcop2_48_idesc *, int unit_num, unsigned long long referenced); -template UINT mep_common_model::model_u_branch_after (mep_ext2_cpu *, const mepcop2_64_idesc *, int unit_num, unsigned long long referenced); // end-generated-instantiations template @@ -166,11 +134,6 @@ mep_common_model::model_u_multiply_after (mep_basic_cpu *, const mep_idesc *, int unit_num, unsigned long long referenced); template UINT mep_common_model::model_u_multiply_after (mep_ext1_cpu *, const mepcore1_idesc *, int unit_num, unsigned long long referenced); -template UINT mep_common_model::model_u_multiply_after (mep_ext2_cpu *, const mepcore2_idesc *, int unit_num, unsigned long long referenced); -template UINT mep_common_model::model_u_multiply_after (mep_ext2_cpu *, const mepcop2_16_idesc *, int unit_num, unsigned long long referenced); -template UINT mep_common_model::model_u_multiply_after (mep_ext2_cpu *, const mepcop2_32_idesc *, int unit_num, unsigned long long referenced); -template UINT mep_common_model::model_u_multiply_after (mep_ext2_cpu *, const mepcop2_48_idesc *, int unit_num, unsigned long long referenced); -template UINT mep_common_model::model_u_multiply_after (mep_ext2_cpu *, const mepcop2_64_idesc *, int unit_num, unsigned long long referenced); // end-generated-instantiations template @@ -188,11 +151,6 @@ mep_common_model::model_u_stcb_after (mep_basic_cpu *, const mep_idesc *, int unit_num, unsigned long long referenced); template UINT mep_common_model::model_u_stcb_after (mep_ext1_cpu *, const mepcore1_idesc *, int unit_num, unsigned long long referenced); -template UINT mep_common_model::model_u_stcb_after (mep_ext2_cpu *, const mepcore2_idesc *, int unit_num, unsigned long long referenced); -template UINT mep_common_model::model_u_stcb_after (mep_ext2_cpu *, const mepcop2_16_idesc *, int unit_num, unsigned long long referenced); -template UINT mep_common_model::model_u_stcb_after (mep_ext2_cpu *, const mepcop2_32_idesc *, int unit_num, unsigned long long referenced); -template UINT mep_common_model::model_u_stcb_after (mep_ext2_cpu *, const mepcop2_48_idesc *, int unit_num, unsigned long long referenced); -template UINT mep_common_model::model_u_stcb_after (mep_ext2_cpu *, const mepcop2_64_idesc *, int unit_num, unsigned long long referenced); // end-generated-instantiations template @@ -217,11 +175,6 @@ mep_common_model::model_u_divide_after (mep_basic_cpu *, const mep_idesc *, int unit_num, unsigned long long referenced); template UINT mep_common_model::model_u_divide_after (mep_ext1_cpu *, const mepcore1_idesc *, int unit_num, unsigned long long referenced); -template UINT mep_common_model::model_u_divide_after (mep_ext2_cpu *, const mepcore2_idesc *, int unit_num, unsigned long long referenced); -template UINT mep_common_model::model_u_divide_after (mep_ext2_cpu *, const mepcop2_16_idesc *, int unit_num, unsigned long long referenced); -template UINT mep_common_model::model_u_divide_after (mep_ext2_cpu *, const mepcop2_32_idesc *, int unit_num, unsigned long long referenced); -template UINT mep_common_model::model_u_divide_after (mep_ext2_cpu *, const mepcop2_48_idesc *, int unit_num, unsigned long long referenced); -template UINT mep_common_model::model_u_divide_after (mep_ext2_cpu *, const mepcop2_64_idesc *, int unit_num, unsigned long long referenced); // end-generated-instantiations template @@ -241,11 +194,6 @@ mep_common_model::model_u_load_gpr_after (mep_basic_cpu *, const mep_idesc *, int unit_num, unsigned long long referenced, INT loadreg); template UINT mep_common_model::model_u_load_gpr_after (mep_ext1_cpu *, const mepcore1_idesc *, int unit_num, unsigned long long referenced, INT loadreg); -template UINT mep_common_model::model_u_load_gpr_after (mep_ext2_cpu *, const mepcore2_idesc *, int unit_num, unsigned long long referenced, INT loadreg); -template UINT mep_common_model::model_u_load_gpr_after (mep_ext2_cpu *, const mepcop2_16_idesc *, int unit_num, unsigned long long referenced, INT loadreg); -template UINT mep_common_model::model_u_load_gpr_after (mep_ext2_cpu *, const mepcop2_32_idesc *, int unit_num, unsigned long long referenced, INT loadreg); -template UINT mep_common_model::model_u_load_gpr_after (mep_ext2_cpu *, const mepcop2_48_idesc *, int unit_num, unsigned long long referenced, INT loadreg); -template UINT mep_common_model::model_u_load_gpr_after (mep_ext2_cpu *, const mepcop2_64_idesc *, int unit_num, unsigned long long referenced, INT loadreg); // end-generated-instantiations template @@ -265,11 +213,6 @@ mep_common_model::model_u_ldcb_gpr_after (mep_basic_cpu *, const mep_idesc *, int unit_num, unsigned long long referenced, INT loadreg); template UINT mep_common_model::model_u_ldcb_gpr_after (mep_ext1_cpu *, const mepcore1_idesc *, int unit_num, unsigned long long referenced, INT loadreg); -template UINT mep_common_model::model_u_ldcb_gpr_after (mep_ext2_cpu *, const mepcore2_idesc *, int unit_num, unsigned long long referenced, INT loadreg); -template UINT mep_common_model::model_u_ldcb_gpr_after (mep_ext2_cpu *, const mepcop2_16_idesc *, int unit_num, unsigned long long referenced, INT loadreg); -template UINT mep_common_model::model_u_ldcb_gpr_after (mep_ext2_cpu *, const mepcop2_32_idesc *, int unit_num, unsigned long long referenced, INT loadreg); -template UINT mep_common_model::model_u_ldcb_gpr_after (mep_ext2_cpu *, const mepcop2_48_idesc *, int unit_num, unsigned long long referenced, INT loadreg); -template UINT mep_common_model::model_u_ldcb_gpr_after (mep_ext2_cpu *, const mepcop2_64_idesc *, int unit_num, unsigned long long referenced, INT loadreg); // end-generated-instantiations template @@ -289,11 +232,6 @@ mep_common_model::model_u_mul_gpr_after (mep_basic_cpu *, const mep_idesc *, int unit_num, unsigned long long referenced, INT resultreg); template UINT mep_common_model::model_u_mul_gpr_after (mep_ext1_cpu *, const mepcore1_idesc *, int unit_num, unsigned long long referenced, INT resultreg); -template UINT mep_common_model::model_u_mul_gpr_after (mep_ext2_cpu *, const mepcore2_idesc *, int unit_num, unsigned long long referenced, INT resultreg); -template UINT mep_common_model::model_u_mul_gpr_after (mep_ext2_cpu *, const mepcop2_16_idesc *, int unit_num, unsigned long long referenced, INT resultreg); -template UINT mep_common_model::model_u_mul_gpr_after (mep_ext2_cpu *, const mepcop2_32_idesc *, int unit_num, unsigned long long referenced, INT resultreg); -template UINT mep_common_model::model_u_mul_gpr_after (mep_ext2_cpu *, const mepcop2_48_idesc *, int unit_num, unsigned long long referenced, INT resultreg); -template UINT mep_common_model::model_u_mul_gpr_after (mep_ext2_cpu *, const mepcop2_64_idesc *, int unit_num, unsigned long long referenced, INT resultreg); // end-generated-instantiations template @@ -330,9 +268,4 @@ mep_common_model::step_latency (sid::host_int_4 cycles); template void mep_common_model::step_latency (sid::host_int_4 cycles); -template void mep_common_model::step_latency (sid::host_int_4 cycles); -template void mep_common_model::step_latency (sid::host_int_4 cycles); -template void mep_common_model::step_latency (sid::host_int_4 cycles); -template void mep_common_model::step_latency (sid::host_int_4 cycles); -template void mep_common_model::step_latency (sid::host_int_4 cycles); // end-generated-instantiations Index: sid/component/cgen-cpu/mep/mep-core1-decode.cxx =================================================================== RCS file: /cvs/src/src/sid/component/cgen-cpu/mep/mep-core1-decode.cxx,v retrieving revision 1.1 diff -p -U3 -r1.1 sid/component/cgen-cpu/mep/mep-core1-decode.cxx --- sid/component/cgen-cpu/mep/mep-core1-decode.cxx 5 Feb 2007 20:28:40 -0000 1.1 +++ sid/component/cgen-cpu/mep/mep-core1-decode.cxx 3 Feb 2009 01:53:51 -0000 @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright (C) 2000-2005 Red Hat, Inc. +Copyright (C) 2000-2007 Red Hat, Inc. This file is part of the Red Hat simulators. @@ -23,213 +23,213 @@ using namespace mep_ext1; // FIXME: name mepcore1_idesc mepcore1_idesc::idesc_table[MEPCORE1_INSN_RI_19 + 1] = { { mepcore1_sem_x_invalid, "X_INVALID", MEPCORE1_INSN_X_INVALID, { 0|(1<> hardware.h_cr64[i]; for (int i = 0; i < 64; i++) ist >> hardware.h_ccr[i]; - ist >> hardware.h_fmax_compare_i_p; } // C++ register access function templates #define current_cpu this @@ -81,16 +77,5 @@ public: inline void h_ccr_set (UINT regno, SI newval) { current_cpu->cgen_set_ccr_value (regno, newval); } - inline SF ext_core2_h_cr_fmax_get (UINT regno) const { return current_cpu->fmax_fr_get_handler (regno); } - inline void ext_core2_h_cr_fmax_set (UINT regno, SF newval) { current_cpu->fmax_fr_set_handler (regno, newval); - } - - inline USI ext_core2_h_ccr_fmax_get (UINT regno) const { return current_cpu->h_ccr_get (regno); } - inline void ext_core2_h_ccr_fmax_set (UINT regno, USI newval) { current_cpu->h_ccr_set (regno, newval); - } - - inline USI ext_core2_h_fmax_compare_i_p_get () const { return this->hardware.h_fmax_compare_i_p; } - inline void ext_core2_h_fmax_compare_i_p_set (USI newval) { this->hardware.h_fmax_compare_i_p = newval; } - #undef current_cpu Index: sid/component/cgen-cpu/mep/mep-decode.cxx =================================================================== RCS file: /cvs/src/src/sid/component/cgen-cpu/mep/mep-decode.cxx,v retrieving revision 1.1 diff -p -U3 -r1.1 sid/component/cgen-cpu/mep/mep-decode.cxx --- sid/component/cgen-cpu/mep/mep-decode.cxx 5 Feb 2007 20:28:40 -0000 1.1 +++ sid/component/cgen-cpu/mep/mep-decode.cxx 3 Feb 2009 01:53:51 -0000 @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright (C) 2000-2005 Red Hat, Inc. +Copyright (C) 2000-2007 Red Hat, Inc. This file is part of the Red Hat simulators. @@ -23,213 +23,213 @@ using namespace mep_basic; // FIXME: nam mep_idesc mep_idesc::idesc_table[MEP_INSN_RI_19 + 1] = { { mep_sem_x_invalid, "X_INVALID", MEP_INSN_X_INVALID, { 0|(1< + + * mm_int.h (no_relation_component): Update to new MeP configuration. + 2007-10-31 Dave Brolley * components.cxx (mepfamily_component_library): Correct DLLEXPORT Index: sid/component/families/mep/mm_int.h =================================================================== RCS file: /cvs/src/src/sid/component/families/mep/mm_int.h,v retrieving revision 1.1 diff -p -U3 -r1.1 sid/component/families/mep/mm_int.h --- sid/component/families/mep/mm_int.h 5 Feb 2007 20:28:40 -0000 1.1 +++ sid/component/families/mep/mm_int.h 3 Feb 2009 01:53:51 -0000 @@ -48,7 +48,7 @@ private: friend class mm_int_interface; // parameters - static const int max_modules = 2; + static const int max_modules = 1; static const int max_channels = 0x100 / 4; // Control bus. mm_int_interface ctrl_bus; Index: sid/main/dynamic/ChangeLog =================================================================== RCS file: /cvs/src/src/sid/main/dynamic/ChangeLog,v retrieving revision 1.45 diff -p -U3 -r1.45 sid/main/dynamic/ChangeLog --- sid/main/dynamic/ChangeLog 17 Jun 2008 18:11:51 -0000 1.45 +++ sid/main/dynamic/ChangeLog 3 Feb 2009 01:53:51 -0000 @@ -1,3 +1,8 @@ +2009-02-02 DJ Delorie + + * mepCfg.cxx (MepMemCfg): Update to new MeP configuration. + * mainDynamic.cxx (mk_sample): Update to new MeP configuration. + 2008-06-17 Dave Brolley * mainDynamic.cxx (usage): Document --reversible. Index: sid/main/dynamic/mainDynamic.cxx =================================================================== RCS file: /cvs/src/src/sid/main/dynamic/mainDynamic.cxx,v retrieving revision 1.12 diff -p -U3 -r1.12 sid/main/dynamic/mainDynamic.cxx --- sid/main/dynamic/mainDynamic.cxx 17 Jun 2008 18:11:51 -0000 1.12 +++ sid/main/dynamic/mainDynamic.cxx 3 Feb 2009 01:53:52 -0000 @@ -48,50 +48,30 @@ mk_basic (const string name, SessionCfg #ifdef SIDTARGET_MEP /* begin-mepcfgtool-factories */ static BoardCfg * -mk_simple (const string name, SessionCfg *sess) +mk_default (const string name, SessionCfg *sess) { - MepBoardCfg *b = new MepBoardCfg (name, "simple", sess); - - b->set_core_type (MEP_CORE_C2); + MepBoardCfg *b = new MepBoardCfg (name, "default", sess); + b->set_core_type (MEP_CORE_C4); b->set_cpu ("mep-ext1"); b->add_irq_board (); - b->set_core_id (1); - b->set_intc_channel_bitw (8); - b->set_intc_level (15); - b->set_opt_biu (64); - b->set_endian ("big"); - b->set_opt_abs (false); - b->set_opt_ave (false); - b->set_opt_bit (false); - b->set_opt_clp (false); - b->set_opt_div (false); - b->set_opt_ldz (false); - b->set_opt_min (false); - b->set_opt_mul (false); - b->set_opt_sat (false); - b->set_opt_dsu (false); - b->set_opt_uci (false); - return b; -} - -static BoardCfg * -mk_fmax (const string name, SessionCfg *sess) -{ - MepBoardCfg *b = new MepBoardCfg (name, "fmax", sess); - - b->set_core_type (MEP_CORE_C2); - b->set_cpu ("mep-ext2"); - b->add_irq_board (); - b->set_core_id (2); - b->set_intc_channel_bitw (8); + b->set_imem_size (32); + b->set_dmem_bank_num (4); + b->set_dmem_size (128); + b->set_icache_size (16); + b->set_icache_way (1); + b->set_icache_line_size (32); + b->set_dcache_size (16); + b->set_dcache_way (1); + b->set_dcache_line_size (32); + b->set_core_id (50); + b->set_intc_channel_bitw (32); b->set_intc_level (15); - b->add_cop ("fmax_cop", 0); - b->set_cop_data_bus_width (32); - b->set_cop_ccr ( 0, 0x00000101); - b->set_cop_ccr ( 1, 0x00000000); - b->set_cop_ccr (15, 0x00000000); + b->set_icache_cwf (false); + b->set_dcache_cwf (false); + b->add_timer (4); + b->add_dmac (6, 64, true); b->set_opt_biu (64); - b->set_endian ("big"); + b->set_endian ("little"); b->set_opt_abs (true); b->set_opt_ave (true); b->set_opt_bit (true); @@ -113,8 +93,7 @@ static boardspec boards [] = { {"basic", "basic cpu + memory board", & mk_basic}, #ifdef SIDTARGET_MEP /* begin-mepcfgtool-boards */ - { "simple", "MeP custom board 'simple'", & mk_simple }, - { "fmax", "MeP custom board 'fmax'", & mk_fmax }, + { "default", "MeP custom board 'default'", & mk_default }, /* end-mepcfgtool-boards */ #endif /* SIDTARGET_MEP */ #if defined (SIDTARGET_SH) || defined (SIDTARGET_SH64) Index: sid/main/dynamic/mepCfg.cxx =================================================================== RCS file: /cvs/src/src/sid/main/dynamic/mepCfg.cxx,v retrieving revision 1.3 diff -p -U3 -r1.3 sid/main/dynamic/mepCfg.cxx --- sid/main/dynamic/mepCfg.cxx 6 Nov 2007 21:06:05 -0000 1.3 +++ sid/main/dynamic/mepCfg.cxx 3 Feb 2009 01:53:52 -0000 @@ -263,7 +263,7 @@ public: // begin-global-memory-regions mems.push_back (new MepMemRegionCfg ("shared-mem0", 0x0, 0x200000, 10, 1, false, true)); mems.push_back (new MepMemRegionCfg ("shared-mem1", 0x800000, 0x800000, 10, 1, true, false)); - mems.push_back (new MepMemRegionCfg ("shared-mem2", 0x80800000, 0x800000, 10, 1, false, false)); + mems.push_back (new MepMemRegionCfg ("shared-mem2", 0x80000000, 0x800000, 10, 1, true, false)); // end-global-memory-regions // begin-shadow-regions @@ -1871,6 +1871,9 @@ void MepBoardCfg::configure_icache () // Pass the appropriate peripheral regions // begin-icache-settings + if (get_module_type () == "default") + { + } // end-icache-settings // pass the imem/dmem space, which is always present. @@ -1949,6 +1952,9 @@ void MepBoardCfg::configure_dcache () // Pass the appropriate peripheral regions // begin-dcache-settings + if (get_module_type () == "default") + { + } // end-dcache-settings // pass the imem/dmem space, which is always present.