X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-validate.h;h=6c4f268f7e9129d764a4d7cba72c95f98e5b776d;hb=59f7d9254f3601cfd48f0c299d5c30562111e991;hp=e7cefb341b61f2b20d8be9f0f5654c8913971f59;hpb=3358092524adbaecaa483d6510fb3d7031441ccb;p=sbcl.git

diff --git a/src/runtime/x86-validate.h b/src/runtime/x86-validate.h
index e7cefb3..6c4f268 100644
--- a/src/runtime/x86-validate.h
+++ b/src/runtime/x86-validate.h
@@ -9,87 +9,8 @@
  * files for more information.
  */
 
-/*
- * $Header$
- */
-
-/*
- * address map:
- *
- *  FreeBSD:
- *	0x00000000->0x0E000000 224M C program and memory allocation.
- *	0x0E000000->0x10000000  32M Foreign segment.
- *	0x10000000->0x20000000 256M Read-Only Space.
- *	0x20000000->0x30000000 256M Reserved for shared libraries.
- *	0x30000000->0x38000000 128M Static Space.
- *	0x38000000->0x40000000 128M Binding stack growing up.
- *	0x40000000->0x48000000 128M Control stack growing down.
- *	0x48000000->0xC8000000 2GB  Dynamic Space.
- *	0xE0000000->           256M C stack - Alien stack.
- *
- *  OpenBSD:
- *      almost the same as FreeBSD
- *
- *  Linux: Note that this map has some problems and requires some further
- *	   development so is not implemented below.
- *	0x00000000->0x08000000 128M Unused.
- *	0x08000000->0x10000000 128M C program and memory allocation.
- *	0x10000000->0x20000000 256M Read-Only Space.
- *	0x20000000->0x28000000 128M Binding stack growing up.
- *	0x28000000->0x38000000 256M Static Space.
- *	0x38000000->0x40000000 128M Control stack growing down.
- *	0x40000000->0x48000000 128M Reserved for shared libraries.
- *	0x48000000->0xB8000000 1.75G Dynamic Space.
- *
- * FIXME: There's something wrong with addressing maps which are so
- * brittle that they can be commented as fixed addresses. Try to
- * parameterize these so they can be set at build time.
- */
-
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
-#define READ_ONLY_SPACE_SIZE    (0x0ffff000) /* 256MB - 1 page */
-
-#if defined __FreeBSD__
-#define STATIC_SPACE_SIZE	(0x07fff000) /* 128M - 1 page */
-#elif defined __OpenBSD__
-#define STATIC_SPACE_SIZE	(0x0ffff000) /* 256M - 1 page */
-#else
-#error unsupported BSD variant
-#endif
-
-
-#define BINDING_STACK_START	(0x38000000)
-#define BINDING_STACK_SIZE	(0x07fff000) /* 128MB - 1 page */
-
-#define CONTROL_STACK_START	(0x40000000)
-#define CONTROL_STACK_SIZE	(0x08000000) /* 128MB */
-
-#define DYNAMIC_SPACE_SIZE	(0x40000000) /* may be up to 2GB */
-#endif
-
-/* FIXME: It's gross to have numbers like 0x50000000 wired into the
- * code in multiple places like this. (Not only does this file know
- * about it, but Lisp code knows about it, because Lisp code is able
- * to generate absolute addresses for all the static symbols even
- * before it's read the map file.) I don't know whether I should
- * actually *fix* this, but I should at least document it some with a
- * KLUDGE marker. And it might even be fixable, by putting all this
- * memory space arbitrariness into an architecture-dependent Lisp
- * file. If so, perhaps I should write somewhere in a "design
- * principles" or "coding principles" file that information like this
- * always flows from Lisp code to C code, through sbcl.h. */
-#ifdef __linux__
-#define READ_ONLY_SPACE_SIZE    (0x02800000) /* 40MB */
-
-#define STATIC_SPACE_SIZE	(0x02fff000) /* 48MB - 1 page */
-
-#define BINDING_STACK_START	(0x60000000)
-#define BINDING_STACK_SIZE	(0x07fff000) /* 128MB - 1 page */
-
-#define CONTROL_STACK_START	(0x50000000)
-#define CONTROL_STACK_SIZE	(0x07fff000) /* 128MB - 1 page */
-
-#define DYNAMIC_SPACE_SIZE	(0x20000000) /* 512MB */
-#endif
-
-#define CONTROL_STACK_END	(CONTROL_STACK_START + CONTROL_STACK_SIZE)
+#define   BINDING_STACK_SIZE (  BINDING_STACK_END -   BINDING_STACK_START)
+#define   CONTROL_STACK_SIZE (  CONTROL_STACK_END -   CONTROL_STACK_START)
+#define   DYNAMIC_SPACE_SIZE (  DYNAMIC_SPACE_END -   DYNAMIC_SPACE_START)
+#define READ_ONLY_SPACE_SIZE (READ_ONLY_SPACE_END - READ_ONLY_SPACE_START)
+#define    STATIC_SPACE_SIZE (   STATIC_SPACE_END -    STATIC_SPACE_START)