* gennltvals.def (m32r): Use common syscall.h now.

	(mn10300): Add entry.
	* nltvals.def: Regenerate.

3 files changed, 57 insertions, 21 deletions

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 7449cdd..19e5434 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,4 +1,8 @@
-Fri Jun 12 13:07:10 1998  Doug Evans  <devans@canuck.cygnus.com>
+Fri Jun 12 18:35:07 1998  Doug Evans  <devans@seba.cygnus.com>
+
+	* gennltvals.def (m32r): Use common syscall.h now.
+	(mn10300): Add entry.
+	* nltvals.def: Regenerate.
 
 	* sim-engine.c (sim_engine_get_run_state): New function.
 	* sim-engine.h (sim_engine_get_run_state): Declare it.
diff --git a/sim/common/gennltvals.sh b/sim/common/gennltvals.sh
index 4c4794b..d5b5d33 100644
--- a/sim/common/gennltvals.sh
+++ b/sim/common/gennltvals.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
-# Generate nltvals.def, a file that describes various target values
-# used by the host/target interface.
+# Generate nltvals.def, a file that describes various newlib/libgloss
+# target values used by the host/target interface.
 #
 # Syntax: /bin/sh gennltvals.sh shell srcroot cpp
 
@@ -29,16 +29,22 @@ $shell ${srccom}/gentvals.sh "" open ${srcroot}/newlib/libc/include \
 # Note that there is a standard syscall.h file (libgloss/syscall.h) now which
 # hopefully more targets can use.
 
-targets="d30v m32r sparc"
-
-for t in $targets
-do
-	case $t in
-	d30v) dir=libgloss macro=d30v ;;
-	m32r) dir=libgloss/m32r/sys macro=m32r ;;
-	sparc) dir=libgloss macro=sparc ;;
-	esac
-
-	$shell ${srccom}/gentvals.sh $macro sys ${srcroot}/$dir \
-		"syscall.h" 'SYS_[_A-Za-z0-9]*' "${cpp}"
-done
+# start-sanitize-d30v
+dir=libgloss target=d30v
+echo "/* start-sanitize-${target} */"
+$shell ${srccom}/gentvals.sh $target sys ${srcroot}/$dir \
+	"syscall.h" 'SYS_[_A-Za-z0-9]*' "${cpp}"
+echo "/* end-sanitize-${target} */"
+# end-sanitize-d30v
+
+dir=libgloss target=m32r
+$shell ${srccom}/gentvals.sh $target sys ${srcroot}/$dir \
+	"syscall.h" 'SYS_[_A-Za-z0-9]*' "${cpp}"
+
+dir=libgloss target=sparc
+$shell ${srccom}/gentvals.sh $target sys ${srcroot}/$dir \
+	"syscall.h" 'SYS_[_A-Za-z0-9]*' "${cpp}"
+
+dir=libgloss target=mn10300
+$shell ${srccom}/gentvals.sh $target sys ${srcroot}/$dir \
+	"syscall.h" 'SYS_[_A-Za-z0-9]*' "${cpp}"
diff --git a/sim/common/nltvals.def b/sim/common/nltvals.def
index 20bfabd..ca438c2 100644
--- a/sim/common/nltvals.def
+++ b/sim/common/nltvals.def
@@ -180,6 +180,7 @@
  { "O_WRONLY", 1  },
 /* end open target macros */
 #endif
+/* start-sanitize-d30v */
 #ifdef NL_TARGET_d30v
 #ifdef sys_defs
 /* from syscall.h */
@@ -204,14 +205,15 @@
 /* end d30v sys target macros */
 #endif
 #endif
+/* end-sanitize-d30v */
 #ifdef NL_TARGET_m32r
 #ifdef sys_defs
 /* from syscall.h */
 /* begin m32r sys target macros */
  { "SYS_argv", 13  },
  { "SYS_argvlen", 12  },
- { "SYS_chdir", 20  },
- { "SYS_chmod", 22  },
+ { "SYS_chdir", 14  },
+ { "SYS_chmod", 16  },
  { "SYS_close", 3  },
  { "SYS_exit", 1  },
  { "SYS_fstat", 10  },
@@ -220,10 +222,10 @@
  { "SYS_lseek", 6  },
  { "SYS_open", 2  },
  { "SYS_read", 4  },
- { "SYS_stat", 21  },
- { "SYS_time", 24  },
+ { "SYS_stat", 15  },
+ { "SYS_time", 18  },
  { "SYS_unlink", 7  },
- { "SYS_utime", 23  },
+ { "SYS_utime", 17  },
  { "SYS_write", 5  },
 /* end m32r sys target macros */
 #endif
@@ -252,3 +254,27 @@
 /* end sparc sys target macros */
 #endif
 #endif
+#ifdef NL_TARGET_mn10300
+#ifdef sys_defs
+/* from syscall.h */
+/* begin mn10300 sys target macros */
+ { "SYS_argv", 13  },
+ { "SYS_argvlen", 12  },
+ { "SYS_chdir", 14  },
+ { "SYS_chmod", 16  },
+ { "SYS_close", 3  },
+ { "SYS_exit", 1  },
+ { "SYS_fstat", 10  },
+ { "SYS_getpid", 8  },
+ { "SYS_kill", 9  },
+ { "SYS_lseek", 6  },
+ { "SYS_open", 2  },
+ { "SYS_read", 4  },
+ { "SYS_stat", 15  },
+ { "SYS_time", 18  },
+ { "SYS_unlink", 7  },
+ { "SYS_utime", 17  },
+ { "SYS_write", 5  },
+/* end mn10300 sys target macros */
+#endif
+#endif