diff options
author | Andy Wingo <wingo@pobox.com> | 2018-06-21 08:39:03 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2018-06-21 20:18:54 +0200 |
commit | 16879cabed0e9bf218986bc886c3336a5f5a21c0 (patch) | |
tree | 3864d5f4926d4141b2ca0a0d378ca7b854aa6cc8 /libguile/gsubr.c | |
parent | 5e5afde06fd9dd0992294d6c7dc9f9966c0caa37 (diff) | |
download | guile-16879cabed0e9bf218986bc886c3336a5f5a21c0.tar.gz |
Replace uses of scm_t_int8, scm_t_uintmax, etc with stdint types
* libguile/bitvectors.c:
* libguile/bitvectors.h:
* libguile/bytevectors.c:
* libguile/bytevectors.h:
* libguile/chars.c:
* libguile/continuations.c:
* libguile/control.c:
* libguile/conv-integer.i.c:
* libguile/conv-uinteger.i.c:
* libguile/dynstack.c:
* libguile/dynstack.h:
* libguile/foreign.c:
* libguile/frames.c:
* libguile/frames.h:
* libguile/gc-inline.h:
* libguile/gc.h:
* libguile/gsubr.c:
* libguile/gsubr.h:
* libguile/hash.c:
* libguile/i18n.c:
* libguile/instructions.c:
* libguile/intrinsics.c:
* libguile/intrinsics.h:
* libguile/loader.c:
* libguile/loader.h:
* libguile/numbers.c:
* libguile/numbers.h:
* libguile/pairs.c:
* libguile/ports-internal.h:
* libguile/ports.c:
* libguile/ports.h:
* libguile/posix.c:
* libguile/print.c:
* libguile/print.h:
* libguile/programs.c:
* libguile/programs.h:
* libguile/r6rs-ports.c:
* libguile/random.c:
* libguile/random.h:
* libguile/scm.h:
* libguile/socket.c:
* libguile/srfi-4.c:
* libguile/srfi-4.h:
* libguile/stacks.c:
* libguile/stime.c:
* libguile/strings.c:
* libguile/struct.c:
* libguile/struct.h:
* libguile/symbols.c:
* libguile/threads.c:
* libguile/threads.h:
* libguile/uniform.c:
* libguile/vm-engine.c:
* libguile/vm.c:
* libguile/vm.h:
* libguile/vports.c:
* test-suite/standalone/test-conversion.c:
* test-suite/standalone/test-ffi-lib.c:
* test-suite/standalone/test-scm-take-u8vector.c:
* test-suite/standalone/test-srfi-4.c: Replace e.g. scm_t_uint8 with
uint8_t.
Diffstat (limited to 'libguile/gsubr.c')
-rw-r--r-- | libguile/gsubr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libguile/gsubr.c b/libguile/gsubr.c index eb4e94b53..01a51a1c3 100644 --- a/libguile/gsubr.c +++ b/libguile/gsubr.c @@ -175,7 +175,7 @@ (generate-bytecode i) (setq i (1+ i))))) */ -static const scm_t_uint32 subr_stub_code[] = { +static const uint32_t subr_stub_code[] = { /* C-u 1 0 M-x generate-bytecodes RET */ /* 0 arguments */ A(0), @@ -234,7 +234,7 @@ static const scm_t_uint32 subr_stub_code[] = { &subr_stub_code[((nreq + nopt + rest) * (nreq + nopt + rest) \ + nopt + rest * (nreq + nopt + rest + 1)) * 6] -static const scm_t_uint32* +static const uint32_t* get_subr_stub_code (unsigned int nreq, unsigned int nopt, unsigned int rest) { if (SCM_UNLIKELY (rest > 1 || nreq + nopt + rest > 10)) @@ -272,28 +272,28 @@ create_subr (int define, const char *name, } int -scm_i_primitive_code_p (const scm_t_uint32 *code) +scm_i_primitive_code_p (const uint32_t *code) { if (code < subr_stub_code) return 0; - if (code > subr_stub_code + (sizeof(subr_stub_code) / sizeof(scm_t_uint32))) + if (code > subr_stub_code + (sizeof(subr_stub_code) / sizeof(uint32_t))) return 0; return 1; } -scm_t_uintptr +uintptr_t scm_i_primitive_call_ip (SCM subr) { size_t i; - const scm_t_uint32 *code = SCM_PROGRAM_CODE (subr); + const uint32_t *code = SCM_PROGRAM_CODE (subr); /* A stub is 6 32-bit words long, or 24 bytes. The call will be one instruction, in either the fourth, third, or second word. Return a byte offset from the entry. */ for (i = 1; i < 4; i++) if ((code[i] & 0xff) == scm_op_subr_call) - return (scm_t_uintptr) (code + i); + return (uintptr_t) (code + i); abort (); } |