diff options
| author | Paul Eggert | 2019-07-20 19:40:03 -0700 |
|---|---|---|
| committer | Paul Eggert | 2019-07-20 20:13:46 -0700 |
| commit | b6f194a0fb6dbd1b19aa01f95a955f5b8b23b40e (patch) | |
| tree | 009e3beff4781c98e733657d60003b3eee97e068 /src/macfont.m | |
| parent | 5018b663c6c0d31f27fb44630a69d9e0bd73273d (diff) | |
| download | emacs-b6f194a0fb6dbd1b19aa01f95a955f5b8b23b40e.tar.gz emacs-b6f194a0fb6dbd1b19aa01f95a955f5b8b23b40e.zip | |
Simplify hashfn/cmpfn calling convention
* src/fns.c (cmpfn_eql, cmpfn_equal, cmpfn_user_defined)
(hashfn_eq, hashfn_equal, hashfn_eql, hashfn_user_defined):
* src/profiler.c (cmpfn_profiler, hashfn_profiler):
Use new calling convention where the return value is a fixnum
instead of EMACS_UINT. While we’re at it, put the hash table
at the end, since that’s a bit simpler and generates better
code (at least on the x86-64). All callers changed.
* src/fns.c (hash_lookup): Store fixnum rather than EMACS_UINT.
All callers changed.
(hash_put): Take a fixnum rather than an EMACS_UINT.
All callers changed. Remove unnecessary eassert (XUFIXNUM does it).
* src/lisp.h (struct hash_table_test):
Adjust signatures of cmpfn and hashfn.
Diffstat (limited to 'src/macfont.m')
| -rw-r--r-- | src/macfont.m | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/macfont.m b/src/macfont.m index 301951f34a5..7170e801407 100644 --- a/src/macfont.m +++ b/src/macfont.m | |||
| @@ -986,8 +986,7 @@ macfont_set_family_cache (Lisp_Object symbol, CFStringRef string) | |||
| 986 | { | 986 | { |
| 987 | struct Lisp_Hash_Table *h; | 987 | struct Lisp_Hash_Table *h; |
| 988 | ptrdiff_t i; | 988 | ptrdiff_t i; |
| 989 | EMACS_UINT hash; | 989 | Lisp_Object hash, value; |
| 990 | Lisp_Object value; | ||
| 991 | 990 | ||
| 992 | if (!HASH_TABLE_P (macfont_family_cache)) | 991 | if (!HASH_TABLE_P (macfont_family_cache)) |
| 993 | macfont_family_cache = CALLN (Fmake_hash_table, QCtest, Qeq); | 992 | macfont_family_cache = CALLN (Fmake_hash_table, QCtest, Qeq); |