* support sim-fpu.c for correct FP emulation.

	* Makefile.in (LIB_OBJ): Add @sim_fpu@.
	(ICACHE_CFLAGS, SEMANTICS_CFLAGS): New variables.
	(icache.o, semantics.o): Add new ICACHE_FLAGS & SEMANTICS_FLAGS.
	(sim-fpu.o, sim-bits.o, tconfig.h): New targets.
	* configure.in: Rename INLINE_LOCALS to PSIM_INLINE_LOCALS.  Add a
	check for sim/common/sim-fpu.c.  Output sim_fpu and sim_fpu_cflags.
	* configure: Regenerate.
	* device.h (device_find_integer_array_property): Match function definition.
	* gen-icache.c (print_icache_internal_function_declaration): Rename
	INLINE_ICACHE to PSIM_INLINE_ICACHE.
	* gen-idecode.c (print_idecode_run_function_header): Rename INLINE_IDECODE
	to PSIM_INLINE_IDECODE.
	* gen-semantics.c (print_semantic_function_header): Rename
	EXTERN_SEMANTICS to PSIM_EXTERN_SEMANTICS.
	* gen-support.c (print_support_function_name): Rename INLINE_SUPPORT to
	PSIM_INLINE_SUPPORT.
	* igen.c (print_function_name): Also escape `(' and `)'.
	(gen_semantics_h): Rename EXTERN_SEMANTICS to PSIM_EXTERN_SEMANTICS.
	(gen_semantics_c): Likewise.  Also output includes for "sim-fpu.h"
	* inline.h (INLINE_SIM_ENDIAN): Renamed INLINE_PSIM_ENDIAN.
	(EXTERN_SIM_ENDIAN): Renamed EXTERN_PSIM_ENDIAN.
	(STATIC_INLINE_SIM_ENDIAN): Renamed STATIC_INLINE_PSIM_ENDIAN.
	(INLINE_LOCALS): Renamed PSIM_INLINE_LOCALS.
	(EXTERN_SUPPORT): Renamed PSIM_EXTERN_SUPPORT.
	(INLINE_SUPPORT): Renamed PSIM_INLINE_SUPPORT.
	(EXTERN_SEMANTICS): Renamed PSIM_EXTERN_SEMANTICS.
	(INLINE_SEMANTICS): Renamed PSIM_INLINE_SEMANTICS.
	(EXTERN_IDECODE): Renamed PSIM_EXTERN_IDECODE.
	(INLINE_IDECODE): Renamed PSIM_INLINE_IDECODE.
	(EXTERN_ICACHE): Renamed PSIM_EXTERN_ICACHE.
	(INLINE_ICACHE): Renamed PSIM_INLINE_ICACHE.
	* options.c (options_inline): Fix names.
	* sim-endian-n.h: Change INLINE_SIM_ENDIAN to INLINE_PSIM_ENDIAN.
	* sim-endian.h: Likewise.
	* sim-main.h: New file.
	* std-config.h: Rename INLINE_LOCALS to PSIM_INLINE_LOCALS.

1 files changed, 52 insertions, 44 deletions

diff --git a/sim/ppc/inline.h b/sim/ppc/inline.h
index f88cd9e..6ff9415 100644
--- a/sim/ppc/inline.h
+++ b/sim/ppc/inline.h
@@ -30,21 +30,21 @@
 
 #if !defined(_SIM_ENDIAN_C_) && (SIM_ENDIAN_INLINE & INCLUDE_MODULE)
 # if (SIM_ENDIAN_INLINE & INLINE_MODULE)
-#  define INLINE_SIM_ENDIAN(TYPE) static INLINE TYPE UNUSED
-#  define EXTERN_SIM_ENDIAN(TYPE) static TYPE UNUSED
+#  define INLINE_PSIM_ENDIAN(TYPE) static INLINE TYPE UNUSED
+#  define EXTERN_PSIM_ENDIAN(TYPE) static TYPE UNUSED
 # else
-#  define INLINE_SIM_ENDIAN(TYPE) static TYPE UNUSED
-#  define EXTERN_SIM_ENDIAN(TYPE) static TYPE UNUSED
+#  define INLINE_PSIM_ENDIAN(TYPE) static TYPE UNUSED
+#  define EXTERN_PSIM_ENDIAN(TYPE) static TYPE UNUSED
 # endif
 #else
-# define INLINE_SIM_ENDIAN(TYPE) TYPE
-# define EXTERN_SIM_ENDIAN(TYPE) TYPE
+# define INLINE_PSIM_ENDIAN(TYPE) TYPE
+# define EXTERN_PSIM_ENDIAN(TYPE) TYPE
 #endif
 
-#if (SIM_ENDIAN_INLINE & INLINE_LOCALS)
-# define STATIC_INLINE_SIM_ENDIAN(TYPE) static INLINE TYPE
+#if (SIM_ENDIAN_INLINE & PSIM_INLINE_LOCALS)
+# define STATIC_INLINE_PSIM_ENDIAN(TYPE) static INLINE TYPE
 #else
-# define STATIC_INLINE_SIM_ENDIAN(TYPE) static TYPE
+# define STATIC_INLINE_PSIM_ENDIAN(TYPE) static TYPE
 #endif
 
 
@@ -63,7 +63,7 @@
 # define EXTERN_BITS(TYPE) TYPE
 #endif
 
-#if (BITS_INLINE & INLINE_LOCALS)
+#if (BITS_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_BITS(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_BITS(TYPE) static TYPE
@@ -85,7 +85,7 @@
 # define EXTERN_CORE(TYPE) TYPE
 #endif
 
-#if (CORE_INLINE & INLINE_LOCALS)
+#if (CORE_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_CORE(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_CORE(TYPE) static TYPE
@@ -107,7 +107,7 @@
 # define EXTERN_VM(TYPE) TYPE
 #endif
 
-#if (VM_INLINE & INLINE_LOCALS)
+#if (VM_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_VM(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_VM(TYPE) static TYPE
@@ -129,7 +129,7 @@
 # define EXTERN_CPU(TYPE) TYPE
 #endif
 
-#if (CPU_INLINE & INLINE_LOCALS)
+#if (CPU_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_CPU(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_CPU(TYPE) static TYPE
@@ -151,7 +151,7 @@
 # define EXTERN_MODEL(TYPE) TYPE
 #endif
 
-#if (MODEL_INLINE & INLINE_LOCALS)
+#if (MODEL_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_MODEL(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_MODEL(TYPE) static TYPE
@@ -173,7 +173,7 @@
 # define EXTERN_EVENTS(TYPE) TYPE
 #endif
 
-#if (EVENTS_INLINE & INLINE_LOCALS)
+#if (EVENTS_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_EVENTS(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_EVENTS(TYPE) static TYPE
@@ -195,7 +195,7 @@
 # define EXTERN_MON(TYPE) TYPE
 #endif
 
-#if (MON_INLINE & INLINE_LOCALS)
+#if (MON_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_MON(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_MON(TYPE) static TYPE
@@ -217,7 +217,7 @@
 # define EXTERN_REGISTERS(TYPE) TYPE
 #endif
 
-#if (REGISTERS_INLINE & INLINE_LOCALS)
+#if (REGISTERS_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_REGISTERS(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_REGISTERS(TYPE) static TYPE
@@ -239,7 +239,7 @@
 # define EXTERN_INTERRUPTS(TYPE) TYPE
 #endif
 
-#if (INTERRUPTS_INLINE & INLINE_LOCALS)
+#if (INTERRUPTS_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_INTERRUPTS(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_INTERRUPTS(TYPE) static TYPE
@@ -261,7 +261,7 @@
 # define EXTERN_DEVICE(TYPE) TYPE
 #endif
 
-#if (DEVICE_INLINE & INLINE_LOCALS)
+#if (DEVICE_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_DEVICE(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_DEVICE(TYPE) static TYPE
@@ -283,7 +283,7 @@
 # define EXTERN_TREE(TYPE) TYPE
 #endif
 
-#if (TREE_INLINE & INLINE_LOCALS)
+#if (TREE_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_TREE(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_TREE(TYPE) static TYPE
@@ -305,7 +305,7 @@
 # define EXTERN_SPREG(TYPE) TYPE
 #endif
 
-#if (SPREG_INLINE & INLINE_LOCALS)
+#if (SPREG_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_SPREG(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_SPREG(TYPE) static TYPE
@@ -316,88 +316,96 @@
 
 #if defined(_INLINE_C_) && !defined(_SEMANTICS_C_) && (SEMANTICS_INLINE & INCLUDE_MODULE)
 # if (SEMANTICS_INLINE & INLINE_MODULE)
-#  define INLINE_SEMANTICS(TYPE) static INLINE TYPE UNUSED
-#  define EXTERN_SEMANTICS(TYPE) static TYPE UNUSED REGPARM
+#  define PSIM_INLINE_SEMANTICS(TYPE) static INLINE TYPE UNUSED
+#  define PSIM_EXTERN_SEMANTICS(TYPE) static TYPE UNUSED REGPARM
 #else
-#  define INLINE_SEMANTICS(TYPE) static TYPE UNUSED REGPARM
-#  define EXTERN_SEMANTICS(TYPE) static TYPE UNUSED REGPARM
+#  define PSIM_INLINE_SEMANTICS(TYPE) static TYPE UNUSED REGPARM
+#  define PSIM_EXTERN_SEMANTICS(TYPE) static TYPE UNUSED REGPARM
 #endif
 #else
-# define INLINE_SEMANTICS(TYPE) TYPE REGPARM
-# define EXTERN_SEMANTICS(TYPE) TYPE REGPARM
+# define PSIM_INLINE_SEMANTICS(TYPE) TYPE REGPARM
+# define PSIM_EXTERN_SEMANTICS(TYPE) TYPE REGPARM
 #endif
 
-#if (SEMANTICS_INLINE & INLINE_LOCALS)
+#if 0 /* this isn't used */
+#if (SEMANTICS_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_SEMANTICS(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_SEMANTICS(TYPE) static TYPE REGPARM
 #endif
+#endif
 
 
 /* idecode is actually not inlined */
 
 #if defined(_INLINE_C_) && !defined(_IDECODE_C_) && (IDECODE_INLINE & INCLUDE_MODULE)
 # if (IDECODE_INLINE & INLINE_MODULE)
-#  define INLINE_IDECODE(TYPE) static INLINE TYPE UNUSED
+#  define PSIM_INLINE_IDECODE(TYPE) static INLINE TYPE UNUSED
 #  define EXTERN_IDECODE(TYPE) static TYPE UNUSED REGPARM
 #else
-#  define INLINE_IDECODE(TYPE) static TYPE UNUSED REGPARM
+#  define PSIM_INLINE_IDECODE(TYPE) static TYPE UNUSED REGPARM
 #  define EXTERN_IDECODE(TYPE) static TYPE UNUSED REGPARM
 #endif
 #else
-# define INLINE_IDECODE(TYPE) TYPE REGPARM
+# define PSIM_INLINE_IDECODE(TYPE) TYPE REGPARM
 # define EXTERN_IDECODE(TYPE) TYPE REGPARM
 #endif
 
-#if (IDECODE_INLINE & INLINE_LOCALS)
+#if 0 /* this isn't used */
+#if (IDECODE_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_IDECODE(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_IDECODE(TYPE) static TYPE REGPARM
 #endif
+#endif
 
 
 /* icache is inlined with inline.c */
 
 #if defined(_INLINE_C_) && !defined(_ICACHE_C_) && (ICACHE_INLINE & INCLUDE_MODULE)
 # if (ICACHE_INLINE & INLINE_MODULE)
-#  define INLINE_ICACHE(TYPE) static INLINE TYPE UNUSED
+#  define PSIM_INLINE_ICACHE(TYPE) static INLINE TYPE UNUSED
 #  define EXTERN_ICACHE(TYPE) static TYPE UNUSED REGPARM
 #else
-#  define INLINE_ICACHE(TYPE) static TYPE UNUSED REGPARM
+#  define PSIM_INLINE_ICACHE(TYPE) static TYPE UNUSED REGPARM
 #  define EXTERN_ICACHE(TYPE) static TYPE UNUSED REGPARM
 #endif
 #else
-# define INLINE_ICACHE(TYPE) TYPE REGPARM
+# define PSIM_INLINE_ICACHE(TYPE) TYPE REGPARM
 # define EXTERN_ICACHE(TYPE) TYPE REGPARM
 #endif
 
-#if (ICACHE_INLINE & INLINE_LOCALS)
+#if 0 /* this isn't used */
+#if (ICACHE_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_ICACHE(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_ICACHE(TYPE) static TYPE REGPARM
 #endif
+#endif
 
 
 /* support is always inlined */
 
 #if !defined(_SUPPORT_C_) && (SUPPORT_INLINE & INCLUDE_MODULE)
 # if (SUPPORT_INLINE & INLINE_MODULE)
-#  define INLINE_SUPPORT(TYPE) static INLINE TYPE UNUSED
+#  define PSIM_INLINE_SUPPORT(TYPE) static INLINE TYPE UNUSED
 #  define EXTERN_SUPPORT(TYPE) static TYPE UNUSED
 #else
-#  define INLINE_SUPPORT(TYPE) static TYPE UNUSED
+#  define PSIM_INLINE_SUPPORT(TYPE) static TYPE UNUSED
 #  define EXTERN_SUPPORT(TYPE) static TYPE UNUSED
 #endif
 #else
-# define INLINE_SUPPORT(TYPE) TYPE
+# define PSIM_INLINE_SUPPORT(TYPE) TYPE
 # define EXTERN_SUPPORT(TYPE) TYPE
 #endif
 
-#if (SUPPORT_INLINE & INLINE_LOCALS)
+#if 0 /* this isn't used */
+#if (SUPPORT_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_SUPPORT(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_SUPPORT(TYPE) static TYPE
 #endif
+#endif
 
 
 /* options is inlined with inline.c */
@@ -415,7 +423,7 @@
 # define EXTERN_OPTIONS(TYPE) TYPE
 #endif
 
-#if (OPTIONS_INLINE & INLINE_LOCALS)
+#if (OPTIONS_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_OPTIONS(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_OPTIONS(TYPE) static TYPE
@@ -437,7 +445,7 @@
 # define EXTERN_OS_EMUL(TYPE) TYPE
 #endif
 
-#if (OS_EMUL_INLINE & INLINE_LOCALS)
+#if (OS_EMUL_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_OS_EMUL(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_OS_EMUL(TYPE) static TYPE
@@ -459,7 +467,7 @@
 # define EXTERN_PSIM(TYPE) TYPE
 #endif
 
-#if (PSIM_INLINE & INLINE_LOCALS)
+#if (PSIM_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_PSIM(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_PSIM(TYPE) static TYPE
@@ -481,7 +489,7 @@
 # define EXTERN_CAP(TYPE) TYPE
 #endif
 
-#if (CAP_INLINE & INLINE_LOCALS)
+#if (CAP_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_CAP(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_CAP(TYPE) static TYPE