Do top level sim-hw module for device tree.

Add to aclocal.m4, update all configure files.

4 files changed, 61 insertions, 2 deletions

diff --git a/sim/common/.Sanitize b/sim/common/.Sanitize
index 7e605bc..a9889a9 100644
--- a/sim/common/.Sanitize
+++ b/sim/common/.Sanitize
@@ -22,7 +22,7 @@ else
         lose_these_too="${cygnus_files} ${lose_these_too}"
 fi
 
-am30_files="dv-core.c dv-pal.c dv-glue.c hw-base.c hw-base.h hw-device.c hw-device.h hw-ports.c hw-ports.h hw-properties.c hw-properties.h hw-tree.c hw-tree.h sim-hw.h"
+am30_files="dv-core.c dv-pal.c dv-glue.c hw-base.c hw-base.h hw-device.c hw-device.h hw-ports.c hw-ports.h hw-properties.c hw-properties.h hw-tree.c hw-tree.h sim-hw.h sim-hw.c"
 if ( echo $* | grep keep\-am30 > /dev/null ) ; then
         keep_these_too="${am30_files} ${keep_these_too}"
 else
@@ -154,7 +154,7 @@ else
         done
 fi
 
-am30_files="ChangeLog"
+am30_files="ChangeLog sim-module.c sim-base.h Make-common.in"
 if ( echo $* | grep keep\-am30 > /dev/null ) ; then
         for i in $am30_files ; do
                 if test ! -d $i && (grep sanitize-am30 $i > /dev/null) ; then
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index b23393b..b0e0385 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,22 @@
+Fri Mar 27 16:15:52 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* hw-tree.h, hw-tree.c (hw_tree_vparse): New function
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
+	* sim-hw.c: New file.
+	* sim-hw.h (sim_hw_parse): Declare function.
+	(hw-tree.h): Do not include.
+	
+	* sim-base.h (STATE_HW): Define.
+	(struct sim_state_base): Add member struct *hw.
+
+	* sim-module.c (sim-hw.h): Include.
+	(modules): Add sim_hw_install.
+	
+	* aclocal.m4 (sim_hw_obj): Add sim-hw.o
+
+end-sanitize-am30
 Fri Mar 27 14:55:06 1998  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* sim-base.h (CPU_INDEX): Define.
diff --git a/sim/common/sim-base.h b/sim/common/sim-base.h
index 1c395df..c8c6a5e 100644
--- a/sim/common/sim-base.h
+++ b/sim/common/sim-base.h
@@ -230,6 +230,13 @@ typedef struct {
   struct sim_breakpoint *breakpoints;
 #define STATE_BREAKPOINTS(sd) ((sd)->base.breakpoints)
 
+  /* start-sanitize-am30 */
+#if WITH_HW
+  struct sim_hw *hw;
+#define STATE_HW(sd) ((sd)->base.hw)
+#endif
+
+  /* end-sanitize-am30 */
   /* Marker for those wanting to do sanity checks.
      This should remain the last member of this struct to help catch
      miscompilation errors.  */
diff --git a/sim/common/sim-hw.h b/sim/common/sim-hw.h
new file mode 100644
index 0000000..0f69d23
--- /dev/null
+++ b/sim/common/sim-hw.h
@@ -0,0 +1,33 @@
+/* Device definitions.
+   Copyright (C) 1998 Free Software Foundation, Inc.
+   Contributed by Cygnus Support.
+
+This file is part of GDB, the GNU debugger.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef SIM_HW_H
+#define SIM_HW_H
+
+void sim_hw_parse
+(SIM_DESC sd,
+ const char *fmt,
+ ...) __attribute__ ((format (printf, 2, 3)));
+
+
+EXTERN_SIM_CORE\
+(SIM_RC) sim_hw_install (SIM_DESC sd);
+
+#endif