Mercurial > hg > xemacs-beta
annotate src/lisp-union.h @ 5891:a0e751d6c3ad
Import the #'clear-string API from GNU, use it in tls.c
src/ChangeLog addition:
2015-04-18 Aidan Kehoe <kehoea@parhasard.net>
* sequence.c (Fclear_string): New, API from GNU. Zero a string's
contents, making sure the text is not kept around even when the
string's data is reallocated because of a changed character
length.
* sequence.c (syms_of_sequence): Make it available to Lisp.
* lisp.h: Make it available to C code.
* tls.c (nss_pk11_password): Use it.
* tls.c (gnutls_pk11_password): Use it.
* tls.c (openssl_password): Use it.
tests/ChangeLog addition:
2015-04-18 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test #'clear-string, just added. Unfortunately there's no way to
be certain from Lisp that the old password data has been erased
after realloc; it may be worth adding a test to tests.c, but
*we'll be reading memory we shouldn't be*, so that gives me pause.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 18 Apr 2015 23:00:14 +0100 |
| parents | 56144c8593a8 |
| children |
| rev | line source |
|---|---|
| 428 | 1 /* Fundamental definitions for XEmacs Lisp interpreter -- union objects. |
| 2 Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994 | |
| 3 Free Software Foundation, Inc. | |
| 5013 | 4 Copyright (C) 2002, 2005, 2010 Ben Wing. |
| 428 | 5 |
| 6 This file is part of XEmacs. | |
| 7 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5013
diff
changeset
|
8 XEmacs is free software: you can redistribute it and/or modify it |
| 428 | 9 under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5013
diff
changeset
|
10 Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5013
diff
changeset
|
11 option) any later version. |
| 428 | 12 |
| 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5013
diff
changeset
|
19 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 428 | 20 |
| 21 /* Divergent from FSF. */ | |
| 22 | |
| 23 /* Definition of Lisp_Object type as a union. | |
| 24 The declaration order of the objects within the struct members | |
| 25 of the union is dependent on ENDIAN-ness. | |
| 26 See lisp-disunion.h for more details. */ | |
| 27 | |
| 28 typedef | |
| 29 union Lisp_Object | |
| 30 { | |
| 31 /* if non-valbits are at lower addresses */ | |
| 442 | 32 #ifdef WORDS_BIGENDIAN |
| 428 | 33 struct |
| 34 { | |
| 35 EMACS_UINT val : VALBITS; | |
| 36 enum_field (Lisp_Type) type : GCTYPEBITS; | |
| 37 } gu; | |
| 38 | |
| 39 struct | |
| 40 { | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
41 signed EMACS_INT val : FIXNUM_VALBITS; |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
42 unsigned int bits : FIXNUM_GCBITS; |
| 428 | 43 } s; |
| 44 | |
| 45 struct | |
| 46 { | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
47 EMACS_UINT val : FIXNUM_VALBITS; |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
48 unsigned int bits : FIXNUM_GCBITS; |
| 428 | 49 } u; |
| 50 #else /* non-valbits are at higher addresses */ | |
| 51 struct | |
| 52 { | |
| 53 enum_field (Lisp_Type) type : GCTYPEBITS; | |
| 54 EMACS_UINT val : VALBITS; | |
| 55 } gu; | |
| 56 | |
| 57 struct | |
| 58 { | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
59 unsigned int bits : FIXNUM_GCBITS; |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
60 signed EMACS_INT val : FIXNUM_VALBITS; |
| 428 | 61 } s; |
| 62 | |
| 63 struct | |
| 64 { | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
65 unsigned int bits : FIXNUM_GCBITS; |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
66 EMACS_UINT val : FIXNUM_VALBITS; |
| 428 | 67 } u; |
| 68 | |
| 69 #endif /* non-valbits are at higher addresses */ | |
| 70 | |
| 71 EMACS_UINT ui; | |
| 72 signed EMACS_INT i; | |
| 73 | |
| 3025 | 74 /* This was formerly declared `void *v' etc. but that causes |
| 428 | 75 GCC to accept any (yes, any) pointer as the argument of |
| 76 a function declared to accept a Lisp_Object. */ | |
| 77 struct nosuchstruct *v; | |
| 78 } | |
| 79 Lisp_Object; | |
| 80 | |
| 3455 | 81 #define XCHARVAL(x) ((EMACS_INT)(x).gu.val) |
| 826 | 82 #define XPNTRVAL(x) ((x).ui) |
| 83 | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
84 #define XREALFIXNUM(x) ((EMACS_INT)(x).s.val) |
| 3455 | 85 #define XUINT(x) ((EMACS_UINT)(x).u.val) |
| 826 | 86 #define XTYPE(x) ((x).gu.type) |
| 87 #define EQ(x,y) ((x).v == (y).v) | |
| 428 | 88 |
| 826 | 89 DECLARE_INLINE_HEADER ( |
| 90 Lisp_Object | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
91 make_fixnum_verify (EMACS_INT val) |
| 826 | 92 ) |
| 93 { | |
| 94 Lisp_Object obj; | |
| 95 obj.s.bits = 1; | |
| 96 obj.s.val = val; | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
97 type_checking_assert (XREALFIXNUM (obj) == val); |
| 826 | 98 return obj; |
| 99 } | |
| 100 | |
| 101 DECLARE_INLINE_HEADER ( | |
| 102 Lisp_Object | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
103 make_fixnum (EMACS_INT val) |
| 826 | 104 ) |
| 428 | 105 { |
| 106 Lisp_Object obj; | |
| 793 | 107 obj.s.bits = 1; |
| 108 obj.s.val = val; | |
| 428 | 109 return obj; |
| 110 } | |
| 111 | |
| 826 | 112 DECLARE_INLINE_HEADER ( |
| 113 Lisp_Object | |
| 867 | 114 make_char_1 (Ichar val) |
| 826 | 115 ) |
| 428 | 116 { |
| 117 Lisp_Object obj; | |
| 793 | 118 obj.gu.type = Lisp_Type_Char; |
| 119 obj.gu.val = val; | |
| 442 | 120 return obj; |
| 121 } | |
| 122 | |
| 826 | 123 DECLARE_INLINE_HEADER ( |
| 124 Lisp_Object | |
| 800 | 125 wrap_pointer_1 (const void *ptr) |
| 826 | 126 ) |
| 442 | 127 { |
| 128 Lisp_Object obj; | |
| 793 | 129 obj.ui = (EMACS_UINT) ptr; |
| 428 | 130 return obj; |
| 131 } | |
| 132 | |
| 1632 | 133 extern MODULE_API Lisp_Object Qnull_pointer, Qzero; |
| 428 | 134 |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
135 #define FIXNUMP(x) ((x).s.bits) |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
136 #define FIXNUM_PLUS(x,y) make_fixnum (XFIXNUM (x) + XFIXNUM (y)) |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
137 #define FIXNUM_MINUS(x,y) make_fixnum (XFIXNUM (x) - XFIXNUM (y)) |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
138 #define FIXNUM_PLUS1(x) make_fixnum (XFIXNUM (x) + 1) |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
139 #define FIXNUM_MINUS1(x) make_fixnum (XFIXNUM (x) - 1) |
| 428 | 140 |
| 853 | 141 /* WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
| 142 | |
| 5013 | 143 You can only GET_LISP_FROM_VOID something that had previously been |
| 144 STORE_LISP_IN_VOID'd. If you want to go the other way, use | |
| 145 STORE_VOID_IN_LISP and GET_VOID_FROM_LISP, or use make_opaque_ptr(). */ | |
| 853 | 146 |
| 5013 | 147 /* Convert a Lisp object to a void * pointer, as when it needs to be passed |
| 148 to a toolkit callback function */ | |
| 149 #define STORE_LISP_IN_VOID(larg) ((void *) ((larg).v)) | |
| 150 | |
| 151 /* Convert a void * pointer back into a Lisp object, assuming that the | |
| 152 pointer was generated by STORE_LISP_IN_VOID. */ | |
| 826 | 153 DECLARE_INLINE_HEADER ( |
| 154 Lisp_Object | |
| 5013 | 155 GET_LISP_FROM_VOID (const void *arg) |
| 826 | 156 ) |
| 157 { | |
| 158 Lisp_Object larg; | |
| 159 larg.v = (struct nosuchstruct *) arg; | |
| 160 return larg; | |
| 161 } | |
| 162 | |
| 428 | 163 /* Convert a Lisp_Object into something that can't be used as an |
| 164 lvalue. Useful for type-checking. */ | |
| 165 #if (__GNUC__ > 1) | |
| 166 #define NON_LVALUE(larg) ({ (larg); }) | |
| 167 #else | |
| 168 /* Well, you can't really do it without using a function call, and | |
| 169 there's no real point in that; no-union-type is the rule, and that | |
| 170 will catch errors. */ | |
| 171 #define NON_LVALUE(larg) (larg) | |
| 172 #endif |