Index: sid/component/cgen-cpu/Makefile.in
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/Makefile.in,v
retrieving revision 1.13
diff -c -p -r1.13 Makefile.in
*** sid/component/cgen-cpu/Makefile.in	4 Jun 2005 03:23:02 -0000	1.13
--- sid/component/cgen-cpu/Makefile.in	15 Jun 2005 21:18:10 -0000
*************** SIDTARGET_M32R_FALSE = @SIDTARGET_M32R_F
*** 182,187 ****
--- 182,189 ----
  SIDTARGET_M32R_TRUE = @SIDTARGET_M32R_TRUE@
  SIDTARGET_M68K_FALSE = @SIDTARGET_M68K_FALSE@
  SIDTARGET_M68K_TRUE = @SIDTARGET_M68K_TRUE@
+ SIDTARGET_MS1_FALSE = @SIDTARGET_MS1_FALSE@
+ SIDTARGET_MS1_TRUE = @SIDTARGET_MS1_TRUE@
  SIDTARGET_MIPS_FALSE = @SIDTARGET_MIPS_FALSE@
  SIDTARGET_MIPS_TRUE = @SIDTARGET_MIPS_TRUE@
  SIDTARGET_PPC_FALSE = @SIDTARGET_PPC_FALSE@
*************** sharedstatedir = @sharedstatedir@
*** 244,249 ****
--- 246,252 ----
  sidtarget_arm = @sidtarget_arm@
  sidtarget_m32r = @sidtarget_m32r@
  sidtarget_m68k = @sidtarget_m68k@
+ sidtarget_ms1 = @sidtarget_ms1@
  sidtarget_mips = @sidtarget_mips@
  sidtarget_ppc = @sidtarget_ppc@
  sidtarget_x86 = @sidtarget_x86@
Index: sid/component/cgen-cpu/aclocal.m4
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/aclocal.m4,v
retrieving revision 1.6
diff -c -p -r1.6 aclocal.m4
*** sid/component/cgen-cpu/aclocal.m4	4 Jun 2005 03:23:02 -0000	1.6
--- sid/component/cgen-cpu/aclocal.m4	15 Jun 2005 21:18:10 -0000
*************** sidtarget_arm=$sidtarget_default
*** 7106,7111 ****
--- 7106,7112 ----
  sidtarget_x86=$sidtarget_default
  sidtarget_mips=$sidtarget_default
  sidtarget_m32r=$sidtarget_default
+ sidtarget_ms1=$sidtarget_default
  sidtarget_m68k=$sidtarget_default
  sidtarget_ppc=$sidtarget_default
  sidtarget_xstormy16=$sidtarget_default
*************** do
*** 7120,7125 ****
--- 7121,7127 ----
        mips*)  sidtarget_mips=1 ;;
        m32r*)  sidtarget_m32r=1 ;;
        m68k*)  sidtarget_m68k=1 ;;
+       ms1*) sidtarget_ms1=1 ;;
        powerpc*) sidtarget_ppc=1 ;;
        ppc*)   sidtarget_ppc=1 ;;
        xstormy16*) sidtarget_xstormy16=1 ;;
*************** case 1 in
*** 7134,7139 ****
--- 7136,7142 ----
    ${sidtarget_mips}) ;;
    ${sidtarget_m32r}) ;;
    ${sidtarget_m68k}) ;;
+   ${sidtarget_ms1}) ;;
    ${sidtarget_ppc}) ;;
    ${sidtarget_xstormy16}) ;;
    *) AC_MSG_WARN([No selected sid targets: use --enable-targets or --target])
*************** AC_SUBST(sidtarget_m68k)
*** 7169,7174 ****
--- 7172,7182 ----
  AM_CONDITIONAL(SIDTARGET_M68K,[test "x$sidtarget_m68k" = x1])
  AC_MSG_RESULT($sidtarget_m68k)
  
+ AC_MSG_CHECKING(MS1 family support)
+ AC_SUBST(sidtarget_ms1)
+ AM_CONDITIONAL(SIDTARGET_MS1,[test "x$sidtarget_ms1" = x1])
+ AC_MSG_RESULT($sidtarget_ms1)
+ 
  AC_MSG_CHECKING(PPC family support)
  AC_SUBST(sidtarget_ppc)
  AM_CONDITIONAL(SIDTARGET_PPC,[test "x$sidtarget_ppc" = x1])
Index: sid/component/cgen-cpu/compCGEN.cxx
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/compCGEN.cxx,v
retrieving revision 1.13
diff -c -p -r1.13 compCGEN.cxx
*** sid/component/cgen-cpu/compCGEN.cxx	25 Jun 2004 17:44:35 -0000	1.13
--- sid/component/cgen-cpu/compCGEN.cxx	15 Jun 2005 21:18:10 -0000
*************** extern "C" {
*** 26,31 ****
--- 26,34 ----
  #if SIDTARGET_M32R
  #include "m32rbf.h"
  #endif
+ #if SIDTARGET_MS1
+ #include "ms1.h"
+ #endif
  #if SIDTARGET_XSTORMY16
  #include "xstormy16.h"
  #endif
*************** compCGENListTypes ()
*** 280,285 ****
--- 283,291 ----
  #if SIDTARGET_ARM
    types.push_back ("hw-cpu-arm7t");
  #endif
+ #if SIDTARGET_MS1
+   types.push_back ("hw-cpu-ms1");
+ #endif
  #if SIDTARGET_XSTORMY16
    types.push_back ("hw-cpu-xstormy16");
  #endif
*************** compCGENCreate (const string& typeName)
*** 299,304 ****
--- 305,314 ----
    if (typeName == "hw-cpu-arm7t")
      return new arm7f::arm7f_cpu ();
  #endif
+ #if SIDTARGET_MS1
+   if (typeName == "hw-cpu-ms1")
+     return new ms1::ms1_cpu ();
+ #endif
  #if SIDTARGET_XSTORMY16
    if (typeName == "hw-cpu-xstormy16")
      return new xstormy16::xstormy16_cpu ();
Index: sid/component/cgen-cpu/configure.in
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/configure.in,v
retrieving revision 1.8
diff -c -p -r1.8 configure.in
*** sid/component/cgen-cpu/configure.in	4 Jun 2005 03:23:03 -0000	1.8
--- sid/component/cgen-cpu/configure.in	15 Jun 2005 21:18:11 -0000
*************** if test $sidtarget_m32r -eq 1; then
*** 53,58 ****
--- 53,62 ----
  	cpu_subdirs="$cpu_subdirs m32r"
          AC_CONFIG_SUBDIRS(m32r)
  fi
+ if test $sidtarget_ms1 -eq 1; then
+ 	cpu_subdirs="$cpu_subdirs ms1"
+         AC_CONFIG_SUBDIRS(ms1)
+ fi
  if test $sidtarget_xstormy16 -eq 1; then
  	cpu_subdirs="$cpu_subdirs xstormy16"
          AC_CONFIG_SUBDIRS(xstormy16)
*************** for dir in $cpu_subdirs; do
*** 64,69 ****
--- 68,74 ----
  done
  
  AC_SUBST(cpu_subdirs)
+ AC_SUBST(cpu_defs)
  AC_SUBST(cpu_incl)
  AC_SUBST(cpu_libs)
  AC_SUBST(cpu_defs)