diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-01-10 13:33:38 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-01-10 13:42:35 -0800 |
| commit | 6a37ecee0884ff30ac7666e6502e2a9d2608f291 (patch) | |
| tree | 875bd8310981ff850911f04da4c3c3b95f34537b /lib-src | |
| parent | 649937920b5023be5c0685d1537f5ea2bfb9899a (diff) | |
| download | emacs-6a37ecee0884ff30ac7666e6502e2a9d2608f291.tar.gz | |
Port to 32-bit --with-wide-int
Prefer symbol indexes to struct Lisp_Symbol * casted and then
widened, as the latter had trouble with GCC on Fedora 21 when
configured --with-wide-int and when used in static initializers.
* lib-src/make-docfile.c (write_globals): Define and use symbols like
iQnil (a small integer, like 0) rather than aQnil (an address
constant).
* src/alloc.c (garbage_collect_1, which_symbols):
* src/lread.c (init_obarray):
Prefer builtin_lisp_symbol when it can be used.
* src/dispextern.h (struct image_type.type):
* src/font.c (font_property_table.key):
* src/frame.c (struct frame_parm_table.sym):
* src/keyboard.c (scroll_bar_parts, struct event_head):
* src/xdisp.c (struct props.name):
Use the index of a builtin symbol rather than its address.
All uses changed.
* src/lisp.h (TAG_SYMPTR, XSYMBOL_INIT): Remove, replacing with ...
(TAG_SYMOFFSET, SYMBOL_INDEX): ... new macros that deal with
symbol indexes rather than pointers, and which work better on MSB
hosts because they shift right before tagging. All uses changed.
(DEFINE_LISP_SYMBOL_BEGIN, DEFINE_LISP_SYMBOL_END):
No longer noops on wide-int hosts, since they work now.
(builtin_lisp_symbol): New function.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/make-docfile.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index ec4d16aaabe..740359605fd 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,5 +1,10 @@ 2015-01-10 Paul Eggert <eggert@cs.ucla.edu> + Port to 32-bit --with-wide-int + * make-docfile.c (write_globals): Define and use symbols like + iQnil (a small integer, like 0) rather than aQnil (an address + constant). + Port to 32-bit Sun C 5.12 sparc * make-docfile.c (close_emacs_globals): Align lispsym to GCALIGNMENT. The alignment is required on all platforms; it just happens to have diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index 7c5c4bcb865..bc5420ea939 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c @@ -613,7 +613,7 @@ compare_globals (const void *a, const void *b) if (ga->type != gb->type) return ga->type - gb->type; - /* Consider "nil" to be the least, so that aQnil is firat. That + /* Consider "nil" to be the least, so that iQnil is zero. That way, Qnil's internal representation is zero, which is a bit faster. */ if (ga->type == SYMBOL) { @@ -701,9 +701,9 @@ write_globals (void) } else if (globals[i].type == SYMBOL) printf (("DEFINE_LISP_SYMBOL_BEGIN (%s)\n" - "#define a%s (&lispsym[%d])\n" - "#define %s make_lisp_symbol (a%s)\n" - "DEFINE_LISP_SYMBOL_END (a%s)\n\n"), + "#define i%s %d\n" + "#define %s builtin_lisp_symbol (i%s)\n" + "DEFINE_LISP_SYMBOL_END (%s)\n\n"), globals[i].name, globals[i].name, symnum++, globals[i].name, globals[i].name, globals[i].name); else |