Add support for --enable-sim-alignment to simulator common aclocal.m4

Add support for --alignment={strict,nonstrict,forced} to simulator common
run-time options.
For v850 use, make the default NONSTRICT_ALIGNMENT.

1 files changed, 16 insertions, 11 deletions

diff --git a/sim/common/sim-config.h b/sim/common/sim-config.h
index 59a8c37798d..cea3101aff1 100644
--- a/sim/common/sim-config.h
+++ b/sim/common/sim-config.h
@@ -339,28 +339,22 @@ extern int current_environment;
 
 
 
-/* Callback/Default Memory.
+/* Callback & Modulo Memory.
 
    Core includes a builtin memory type (raw_memory) that is
    implemented using an array.  raw_memory does not require any
    additional functions etc.
 
    Callback memory is where the core calls a core device for the data
-   it requires.
+   it requires.  Callback memory can be layered using priorities.
 
-   Default memory is an extenstion of this where for addresses that do
-   not map into either a callback or core memory range a default map
-   can be used.
+   Modulo memory is a variation on raw_memory where ADDRESS & (MODULO
+   - 1) is used as the index into the memory array.
 
-   The OEA model uses callback memory for devices and default memory
-   for buses.
+   The OEA model uses callback memory for devices.
 
    The VEA model uses callback memory to capture `page faults'.
 
-   While it may be possible to eliminate callback/default memory (and
-   hence also eliminate an additional test per memory fetch) it
-   probably is not worth the effort.
-
    BTW, while raw_memory could have been implemented as a callback,
    profiling has shown that there is a biger win (at least for the
    x86) in eliminating a function call for the most common
@@ -370,6 +364,10 @@ extern int current_environment;
 #define WITH_CALLBACK_MEMORY		1
 #endif
 
+#ifndef WITH_MODULO_MEMORY
+#define WITH_MODULO_MEMORY              0
+#endif
+
 
 
 /* Alignment:
@@ -399,6 +397,13 @@ extern enum sim_alignments current_alignment;
 #define WITH_ALIGNMENT NONSTRICT_ALIGNMENT
 #endif
 
+#if !defined (WITH_DEFAULT_ALIGNMENT)
+#define WITH_DEFAULT_ALIGNMENT 0 /* fatal */
+#endif
+
+
+
+
 #define CURRENT_ALIGNMENT (WITH_ALIGNMENT \
 			   ? WITH_ALIGNMENT \
 			   : current_alignment)