comparison src/alloc.c @ 826:6728e641994e

[xemacs-hg @ 2002-05-05 11:30:15 by ben] syntax cache, 8-bit-format, lots of code cleanup README.packages: Update info about --package-path. i.c: Create an inheritable event and pass it on to XEmacs, so that ^C can be handled properly. Intercept ^C and signal the event. "Stop Build" in VC++ now works. bytecomp-runtime.el: Doc string changes. compat.el: Some attempts to redo this to make it truly useful and fix the "multiple versions interacting with each other" problem. Not yet done. Currently doesn't work. files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code. xemacs.mak: Split up CFLAGS into a version without flags specifying the C library. The problem seems to be that minitar depends on zlib, which depends specifically on libc.lib, not on any of the other C libraries. Unless you compile with libc.lib, you get errors -- specifically, no _errno in the other libraries, which must make it something other than an int. (#### But this doesn't seem to obtain in XEmacs, which also uses zlib, and can be linked with any of the C libraries. Maybe zlib is used differently and doesn't need errno, or maybe XEmacs provides an int errno; ... I don't understand. Makefile.in.in: Fix so that packages are around when testing. abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch. -- FUNCTIONALITY CHANGES: add partial support for 8-bit-fixed, 16-bit-fixed, and 32-bit-fixed formats. not quite done yet. (in particular, needs functions to actually convert the buffer.) NOTE: lots of changes to regex.c here. also, many new *_fmt() inline funs that take an Internal_Format argument. redo syntax cache code. make the cache per-buffer; keep the cache valid across calls to functions that use it. also keep it valid across insertions/deletions and extent changes, as much as is possible. eliminate the junky regex-reentrancy code by passing in the relevant lisp info to the regex routines as local vars. add general mechanism in extents code for signalling extent changes. fix numerous problems with the case-table implementation; yoshiki never properly transferred many algorithms from old-style to new-style case tables. redo char tables to support a default argument, so that mapping only occurs over changed args. change many chartab functions to accept Lisp_Object instead of Lisp_Char_Table *. comment out the code in font-lock.c by default, because font-lock.el no longer uses it. we should consider eliminating it entirely. Don't output bell as ^G in console-stream when not a TTY. add -mswindows-termination-handle to interface with i.c, so we can properly kill a build. add more error-checking to buffer/string macros. add some additional buffer_or_string_() funs. -- INTERFACE CHANGES AFFECTING MORE CODE: switch the arguments of write_c_string and friends to be consistent with write_fmt_string, which must have printcharfun first. change BI_* macros to BYTE_* for increased clarity; similarly for bi_* local vars. change VOID_TO_LISP to be a one-argument function. eliminate no-longer-needed CVOID_TO_LISP. -- char/string macro changes: rename MAKE_CHAR() to make_emchar() for slightly less confusion with make_char(). (The former generates an Emchar, the latter a Lisp object. Conceivably we should rename make_char() -> wrap_char() and similarly for make_int(), make_float().) Similar changes for other *CHAR* macros -- we now consistently use names with `emchar' whenever we are working with Emchars. Any remaining name with just `char' always refers to a Lisp object. rename macros with XSTRING_* to string_* except for those that reference actual fields in the Lisp_String object, following conventions used elsewhere. rename set_string_{data,length} macros (the only ones to work with a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_* to make the difference clear. try to be consistent about caps vs. lowercase in macro/inline-fun names for chars and such, which wasn't the case before. we now reserve caps either for XFOO_ macros that reference object fields (e.g. XSTRING_DATA) or for things that have non-function semantics, e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an arg (any arg) more than once. otherwise, use lowercase. here is a summary of most of the macros/inline funs changed by all of the above changes: BYTE_*_P -> byte_*_p XSTRING_BYTE -> string_byte set_string_data/length -> set_lispstringp_data/length XSTRING_CHAR_LENGTH -> string_char_length XSTRING_CHAR -> string_emchar INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p charptr_copy_char -> charptr_copy_emchar LEADING_BYTE_* -> leading_byte_* CHAR_* -> EMCHAR_* *_CHAR_* -> *_EMCHAR_* *_CHAR -> *_EMCHAR CHARSET_BY_ -> charset_by_* BYTE_SHIFT_JIS* -> byte_shift_jis* BYTE_BIG5* -> byte_big5* REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte char_to_unicode -> emchar_to_unicode valid_char_p -> valid_emchar_p Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality). -- INTERFACE CHANGES AFFECTING LESS CODE: use DECLARE_INLINE_HEADER in various places. remove '#ifdef emacs' from XEmacs-only files. eliminate CHAR_TABLE_VALUE(), which duplicated the functionality of get_char_table(). add BUFFER_TEXT_LOOP to simplify iterations over buffer text. define typedefs for signed and unsigned types of fixed sizes (INT_32_BIT, UINT_32_BIT, etc.). create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE; fix code to use it. add charptr_emchar_len to return the text length of the character pointed to by a ptr; use it in place of charcount_to_bytecount(..., 1). add emchar_len to return the text length of a given character. add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount and Charbpos/Charcount, in code (particularly, the extents code and redisplay code) that works with either kind of index. rename redisplay struct params with names such as `charbpos' to e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos. eliminate xxDEFUN in place of DEFUN; no longer necessary with changes awhile back to doc.c. split up big ugly combined list of EXFUNs in lisp.h on a file-by-file basis, since other prototypes are similarly split. rewrite some "*_UNSAFE" macros as inline funs and eliminate the _UNSAFE suffix. move most string code from lisp.h to text.h; the string code and text.h code is now intertwined in such a fashion that they need to be in the same place and partially interleaved. (you can't create forward references for inline funs) automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in batch mode. Fix up some problems in lisp-tests/symbol-tests that were causing spurious failures.
author ben
date Sun, 05 May 2002 11:33:57 +0000
parents a634e3b7acc8
children e7ee5f8bde58
comparison
equal deleted inserted replaced
825:eb3bc15a6e0f 826:6728e641994e
343 free (block); 343 free (block);
344 } 344 }
345 345
346 #ifdef ERROR_CHECK_GC 346 #ifdef ERROR_CHECK_GC
347 347
348 #if SIZEOF_INT == 4
349 typedef unsigned int four_byte_t;
350 #elif SIZEOF_LONG == 4
351 typedef unsigned long four_byte_t;
352 #elif SIZEOF_SHORT == 4
353 typedef unsigned short four_byte_t;
354 #else
355 What kind of strange-ass system are we running on?
356 #endif
357
358 static void 348 static void
359 deadbeef_memory (void *ptr, Bytecount size) 349 deadbeef_memory (void *ptr, Bytecount size)
360 { 350 {
361 four_byte_t *ptr4 = (four_byte_t *) ptr; 351 UINT_32_BIT *ptr4 = (UINT_32_BIT *) ptr;
362 Bytecount beefs = size >> 2; 352 Bytecount beefs = size >> 2;
363 353
364 /* In practice, size will always be a multiple of four. */ 354 /* In practice, size will always be a multiple of four. */
365 while (beefs--) 355 while (beefs--)
366 (*ptr4++) = 0xDEADBEEF; 356 (*ptr4++) = 0xDEADBEEF;
1830 /* If SIZE is the length of a string, this returns how many bytes 1820 /* If SIZE is the length of a string, this returns how many bytes
1831 * the string occupies in string_chars_block->string_chars 1821 * the string occupies in string_chars_block->string_chars
1832 * (including alignment padding). 1822 * (including alignment padding).
1833 */ 1823 */
1834 #define STRING_FULLSIZE(size) \ 1824 #define STRING_FULLSIZE(size) \
1835 ALIGN_SIZE (((size) + 1 + sizeof (Lisp_String *)),\ 1825 ALIGN_FOR_TYPE (((size) + 1 + sizeof (Lisp_String *)), Lisp_String *)
1836 ALIGNOF (Lisp_String *))
1837 1826
1838 #define BIG_STRING_FULLSIZE_P(fullsize) ((fullsize) >= STRING_CHARS_BLOCK_SIZE) 1827 #define BIG_STRING_FULLSIZE_P(fullsize) ((fullsize) >= STRING_CHARS_BLOCK_SIZE)
1839 #define BIG_STRING_SIZE_P(size) (BIG_STRING_FULLSIZE_P (STRING_FULLSIZE(size))) 1828 #define BIG_STRING_SIZE_P(size) (BIG_STRING_FULLSIZE_P (STRING_FULLSIZE(size)))
1840 1829
1841 #define STRING_CHARS_FREE_P(ptr) ((ptr)->string == NULL) 1830 #define STRING_CHARS_FREE_P(ptr) ((ptr)->string == NULL)
1906 { 1895 {
1907 Bytecount i; 1896 Bytecount i;
1908 1897
1909 for (i = 0; i < XSTRING_LENGTH (str); i++) 1898 for (i = 0; i < XSTRING_LENGTH (str); i++)
1910 { 1899 {
1911 if (!BYTE_ASCII_P (XSTRING_BYTE (str, i))) 1900 if (!byte_ascii_p (string_byte (str, i)))
1912 break; 1901 break;
1913 } 1902 }
1914 1903
1915 assert (i == (Bytecount) XSTRING_ASCII_BEGIN (str) || 1904 assert (i == (Bytecount) XSTRING_ASCII_BEGIN (str) ||
1916 (i > MAX_STRING_ASCII_BEGIN && 1905 (i > MAX_STRING_ASCII_BEGIN &&
1934 /* Allocate the string header */ 1923 /* Allocate the string header */
1935 ALLOCATE_FIXED_TYPE (string, Lisp_String, s); 1924 ALLOCATE_FIXED_TYPE (string, Lisp_String, s);
1936 xzero (*s); 1925 xzero (*s);
1937 set_lheader_implementation (&s->u.lheader, &lrecord_string); 1926 set_lheader_implementation (&s->u.lheader, &lrecord_string);
1938 1927
1939 set_string_data (s, BIG_STRING_FULLSIZE_P (fullsize) 1928 set_lispstringp_data (s, BIG_STRING_FULLSIZE_P (fullsize)
1940 ? xnew_array (Intbyte, length + 1) 1929 ? xnew_array (Intbyte, length + 1)
1941 : allocate_string_chars_struct (wrap_string (s), 1930 : allocate_string_chars_struct (wrap_string (s),
1942 fullsize)->chars); 1931 fullsize)->chars);
1943 1932
1944 set_string_length (s, length); 1933 set_lispstringp_length (s, length);
1945 s->plist = Qnil; 1934 s->plist = Qnil;
1946 set_string_byte (wrap_string (s), length, 0); 1935 set_string_byte (wrap_string (s), length, 0);
1947 1936
1948 return wrap_string (s); 1937 return wrap_string (s);
1949 } 1938 }
2104 void 2093 void
2105 set_string_char (Lisp_Object s, Charcount i, Emchar c) 2094 set_string_char (Lisp_Object s, Charcount i, Emchar c)
2106 { 2095 {
2107 Intbyte newstr[MAX_EMCHAR_LEN]; 2096 Intbyte newstr[MAX_EMCHAR_LEN];
2108 Bytecount bytoff = string_index_char_to_byte (s, i); 2097 Bytecount bytoff = string_index_char_to_byte (s, i);
2109 Bytecount oldlen = charcount_to_bytecount (XSTRING_DATA (s) + bytoff, 1); 2098 Bytecount oldlen = charptr_emchar_len (XSTRING_DATA (s) + bytoff);
2110 Bytecount newlen = set_charptr_emchar (newstr, c); 2099 Bytecount newlen = set_charptr_emchar (newstr, c);
2111 2100
2112 sledgehammer_check_ascii_begin (s); 2101 sledgehammer_check_ascii_begin (s);
2113 if (oldlen != newlen) 2102 if (oldlen != newlen)
2114 resize_string (s, bytoff, newlen - oldlen); 2103 resize_string (s, bytoff, newlen - oldlen);
2124 /* We've extended ascii_begin, and we have to figure out how much by */ 2113 /* We've extended ascii_begin, and we have to figure out how much by */
2125 { 2114 {
2126 Bytecount j; 2115 Bytecount j;
2127 for (j = (Bytecount) i + 1; j < XSTRING_LENGTH (s); j++) 2116 for (j = (Bytecount) i + 1; j < XSTRING_LENGTH (s); j++)
2128 { 2117 {
2129 if (!BYTE_ASCII_P (XSTRING_DATA (s)[j])) 2118 if (!byte_ascii_p (XSTRING_DATA (s)[j]))
2130 break; 2119 break;
2131 } 2120 }
2132 XSET_STRING_ASCII_BEGIN (s, min (j, (Bytecount) MAX_STRING_ASCII_BEGIN)); 2121 XSET_STRING_ASCII_BEGIN (s, min (j, (Bytecount) MAX_STRING_ASCII_BEGIN));
2133 } 2122 }
2134 } 2123 }
2206 Bytecount length = XSTRING_LENGTH (string); 2195 Bytecount length = XSTRING_LENGTH (string);
2207 Intbyte *contents = XSTRING_DATA (string); 2196 Intbyte *contents = XSTRING_DATA (string);
2208 2197
2209 for (i = 0; i < length; i++) 2198 for (i = 0; i < length; i++)
2210 { 2199 {
2211 if (!BYTE_ASCII_P (contents[i])) 2200 if (!byte_ascii_p (contents[i]))
2212 break; 2201 break;
2213 } 2202 }
2214 XSET_STRING_ASCII_BEGIN (string, min (i, MAX_STRING_ASCII_BEGIN)); 2203 XSET_STRING_ASCII_BEGIN (string, min (i, MAX_STRING_ASCII_BEGIN));
2215 #else 2204 #else
2216 XSET_STRING_ASCII_BEGIN (string, min (XSTRING_LENGTH (string), 2205 XSET_STRING_ASCII_BEGIN (string, min (XSTRING_LENGTH (string),
2299 /* Allocate the string header */ 2288 /* Allocate the string header */
2300 ALLOCATE_FIXED_TYPE (string, Lisp_String, s); 2289 ALLOCATE_FIXED_TYPE (string, Lisp_String, s);
2301 set_lheader_implementation (&s->u.lheader, &lrecord_string); 2290 set_lheader_implementation (&s->u.lheader, &lrecord_string);
2302 SET_C_READONLY_RECORD_HEADER (&s->u.lheader); 2291 SET_C_READONLY_RECORD_HEADER (&s->u.lheader);
2303 s->plist = Qnil; 2292 s->plist = Qnil;
2304 set_string_data (s, (Intbyte *) contents); 2293 set_lispstringp_data (s, (Intbyte *) contents);
2305 set_string_length (s, length); 2294 set_lispstringp_length (s, length);
2306 val = wrap_string (s); 2295 val = wrap_string (s);
2307 init_string_ascii_begin (val); 2296 init_string_ascii_begin (val);
2308 sledgehammer_check_ascii_begin (val); 2297 sledgehammer_check_ascii_begin (val);
2309 2298
2310 return val; 2299 return val;
3277 /* Copy the string_chars to the new place. */ 3266 /* Copy the string_chars to the new place. */
3278 if (from_s_chars != to_s_chars) 3267 if (from_s_chars != to_s_chars)
3279 memmove (to_s_chars, from_s_chars, fullsize); 3268 memmove (to_s_chars, from_s_chars, fullsize);
3280 3269
3281 /* Relocate FROM_S_CHARS's reference */ 3270 /* Relocate FROM_S_CHARS's reference */
3282 set_string_data (string, &(to_s_chars->chars[0])); 3271 set_lispstringp_data (string, &(to_s_chars->chars[0]));
3283 3272
3284 from_pos += fullsize; 3273 from_pos += fullsize;
3285 to_pos += fullsize; 3274 to_pos += fullsize;
3286 } 3275 }
3287 } 3276 }
3309 3298
3310 static void 3299 static void
3311 debug_string_purity_print (Lisp_Object p) 3300 debug_string_purity_print (Lisp_Object p)
3312 { 3301 {
3313 Charcount i; 3302 Charcount i;
3314 Charcount s = XSTRING_CHAR_LENGTH (p); 3303 Charcount s = string_char_length (p);
3315 stderr_out ("\""); 3304 stderr_out ("\"");
3316 for (i = 0; i < s; i++) 3305 for (i = 0; i < s; i++)
3317 { 3306 {
3318 Emchar ch = XSTRING_CHAR (p, i); 3307 Emchar ch = string_emchar (p, i);
3319 if (ch < 32 || ch >= 126) 3308 if (ch < 32 || ch >= 126)
3320 stderr_out ("\\%03o", ch); 3309 stderr_out ("\\%03o", ch);
3321 else if (ch == '\\' || ch == '\"') 3310 else if (ch == '\\' || ch == '\"')
3322 stderr_out ("\\%c", ch); 3311 stderr_out ("\\%c", ch);
3323 else 3312 else