aboutsummaryrefslogtreecommitdiffstats
path: root/src/m
diff options
context:
space:
mode:
authorDan Nicolaescu2010-07-07 20:03:52 -0700
committerDan Nicolaescu2010-07-07 20:03:52 -0700
commit313d9eb21863418cb91328c3d5ef0c2d356fc483 (patch)
tree87aa5f39b43cc9c308839047bc83345d518f5d0a /src/m
parentd734dbbd24fca96383d2583c36d2a805181cf306 (diff)
downloademacs-313d9eb21863418cb91328c3d5ef0c2d356fc483.tar.gz
emacs-313d9eb21863418cb91328c3d5ef0c2d356fc483.zip
Simplify start_of_data, start_of_text and related code.
* src/mem-limits.h: Remove !emacs and _LIBC conditional code. (start_of_data): Merge into start_of_data function. * src/sysdep.c (start_of_text): Remove. Move simplified versions of it in the only users: src/unexaix.c and unexec.c. (read_input_waiting): Remove local declaration of quit_char. (start, etext): Remove declarations. (start_of_data): Merge with the version in mem-limits.h and move to vm-limits.c. * src/vm-limit.c (start_of_data): Merged and simplified version of the code formerly in mem-limits.h and sysdep.c. * src/unexec.c (start): New declaration, moved from sysdep.c. (start_of_text): Simplified version of the code formerly in sysdep.c. * unexaix.c (start_of_text): Simplified version of the code formerly in sysdep.c. * src/m/alpha.h (HAVE_TEXT_START): Remove. (TEXT_START): Move ... * src/unexalpha.c (TEXT_START): ... here. * src/s/hpux10-20.h (TEXT_START): Remove. * src/s/darwin.h (TEXT_START): * src/m/mips.h (TEXT_START): * src/m/macppc.h (HAVE_TEXT_START): * src/m/m68k.h (TEXT_START): * src/m/iris4d.h (TEXT_START): * src/m/intel386.h (TEXT_START): * src/m/ibmrs6000.h (TEXT_START): * src/m/ia64.h (HAVE_TEXT_START): * src/s/msdos.h (TEXT_START): Likewise.
Diffstat (limited to 'src/m')
-rw-r--r--src/m/alpha.h5
-rw-r--r--src/m/ia64.h2
-rw-r--r--src/m/ibmrs6000.h1
-rw-r--r--src/m/intel386.h4
-rw-r--r--src/m/iris4d.h2
-rw-r--r--src/m/m68k.h1
-rw-r--r--src/m/macppc.h4
-rw-r--r--src/m/mips.h3
8 files changed, 0 insertions, 22 deletions
diff --git a/src/m/alpha.h b/src/m/alpha.h
index a7e4fa6b07b..ae8fd62d6f8 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -53,14 +53,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
53#define DATA_START 0x140000000 53#define DATA_START 0x140000000
54#endif 54#endif
55 55
56#if (defined (__NetBSD__) || defined (__OpenBSD__))
57#define HAVE_TEXT_START
58#endif
59
60#else /* not __ELF__ */ 56#else /* not __ELF__ */
61 57
62/* Describe layout of the address space in an executing process. */ 58/* Describe layout of the address space in an executing process. */
63#define TEXT_START 0x120000000
64#define DATA_START 0x140000000 59#define DATA_START 0x140000000
65 60
66#endif /* __ELF__ */ 61#endif /* __ELF__ */
diff --git a/src/m/ia64.h b/src/m/ia64.h
index 76e2bb87d80..5266c682c78 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -58,7 +58,5 @@ extern void r_alloc_free ();
58#endif /* not _MALLOC_INTERNAL */ 58#endif /* not _MALLOC_INTERNAL */
59#endif /* REL_ALLOC */ 59#endif /* REL_ALLOC */
60 60
61#define HAVE_TEXT_START
62
63/* arch-tag: 9b8e9fb2-2e49-4c22-b68f-11a488e77c66 61/* arch-tag: 9b8e9fb2-2e49-4c22-b68f-11a488e77c66
64 (do not change this comment) */ 62 (do not change this comment) */
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 3831e500641..a44b2c4ec3b 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -22,7 +22,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
22/* The data segment in this machine always starts at address 0x20000000. 22/* The data segment in this machine always starts at address 0x20000000.
23 An address of data cannot be stored correctly in a Lisp object; 23 An address of data cannot be stored correctly in a Lisp object;
24 we always lose the high bits. We must tell XPNTR to add them back. */ 24 we always lose the high bits. We must tell XPNTR to add them back. */
25#define TEXT_START 0x10000000
26#define DATA_START 0x20000000 25#define DATA_START 0x20000000
27#define WORDS_BIG_ENDIAN 26#define WORDS_BIG_ENDIAN
28#define DATA_SEG_BITS 0x20000000 27#define DATA_SEG_BITS 0x20000000
diff --git a/src/m/intel386.h b/src/m/intel386.h
index 984a9959736..76e5929e4e6 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -23,10 +23,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
23 is the most significant byte. */ 23 is the most significant byte. */
24#undef WORDS_BIG_ENDIAN 24#undef WORDS_BIG_ENDIAN
25 25
26#ifdef USG
27#define TEXT_START 0
28#endif /* USG */
29
30#ifdef WINDOWSNT 26#ifdef WINDOWSNT
31#define VIRT_ADDR_VARIES 27#define VIRT_ADDR_VARIES
32#define DATA_START get_data_start () 28#define DATA_START get_data_start ()
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index e7f332057e5..2ba6b5ba7ce 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -30,8 +30,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
30 This flag only matters if you use USE_LISP_UNION_TYPE. */ 30 This flag only matters if you use USE_LISP_UNION_TYPE. */
31#define EXPLICIT_SIGN_EXTEND 31#define EXPLICIT_SIGN_EXTEND
32 32
33#define TEXT_START 0x400000
34
35/* DATA_SEG_BITS forces extra bits to be or'd in with any pointers which 33/* DATA_SEG_BITS forces extra bits to be or'd in with any pointers which
36 were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for 34 were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for
37 the value field of a LISP_OBJECT). */ 35 the value field of a LISP_OBJECT). */
diff --git a/src/m/m68k.h b/src/m/m68k.h
index 668db282593..5a083205e50 100644
--- a/src/m/m68k.h
+++ b/src/m/m68k.h
@@ -41,7 +41,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
41#endif 41#endif
42 42
43#define NO_REMAP 43#define NO_REMAP
44#define TEXT_START 0
45#endif 44#endif
46 45
47/* arch-tag: 4eadd161-b4e8-4b82-82a1-e4ce7f42969d 46/* arch-tag: 4eadd161-b4e8-4b82-82a1-e4ce7f42969d
diff --git a/src/m/macppc.h b/src/m/macppc.h
index f348286030c..2764ae56115 100644
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -28,10 +28,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
28/* Convert that into an integer that is 100 for a load average of 1.0 */ 28/* Convert that into an integer that is 100 for a load average of 1.0 */
29#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) 29#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
30 30
31#if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__)
32#define HAVE_TEXT_START
33#endif
34
35#ifdef _ARCH_PPC64 31#ifdef _ARCH_PPC64
36#ifndef _LP64 32#ifndef _LP64
37#define _LP64 33#define _LP64
diff --git a/src/m/mips.h b/src/m/mips.h
index 8e81c077426..39a948c0cde 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -31,8 +31,5 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
31 This flag only matters if you use USE_LISP_UNION_TYPE. */ 31 This flag only matters if you use USE_LISP_UNION_TYPE. */
32#define EXPLICIT_SIGN_EXTEND 32#define EXPLICIT_SIGN_EXTEND
33 33
34/* Describe layout of the address space in an executing process. */
35#define TEXT_START 0x00400000
36
37/* arch-tag: 8fd020ee-78a7-4d87-96ce-6129f52f7bee 34/* arch-tag: 8fd020ee-78a7-4d87-96ce-6129f52f7bee
38 (do not change this comment) */ 35 (do not change this comment) */