Changeset 16134


Ignore:
Timestamp:
Jul 25, 2014, 1:57:15 AM (7 years ago)
Author:
rme
Message:

Use the standard integer type names from stdint.h.

Location:
trunk/source/lisp-kernel
Files:
3 deleted
23 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/lisp-kernel/lisptypes.h

    r13599 r16134  
    1919#define __lisptypes__
    2020
     21#include <stdint.h>
    2122
    2223#if WORD_SIZE == 64
    23 typedef u64_t LispObj;
    24 typedef u64_t natural;
    25 typedef s64_t signed_natural;
    26 typedef u64_t unsigned_of_pointer_size;
     24typedef uint64_t LispObj;
     25typedef uint64_t natural;
     26typedef int64_t signed_natural;
    2727#else
    28 typedef u32_t LispObj;
    29 typedef u32_t natural;
    30 typedef s32_t signed_natural;
    31 typedef u32_t unsigned_of_pointer_size;
     28typedef uint32_t LispObj;
     29typedef uint32_t natural;
     30typedef int32_t signed_natural;
    3231#endif
    3332
    34 
    35 typedef u32_t lisp_char_code;
     33typedef int32_t lisp_char_code;
    3634
    3735typedef int OSStatus, OSErr;
     
    4038typedef void *LogicalAddress;
    4139typedef char *Ptr, *BytePtr, *StringPtr;
    42 typedef unsigned int UInt32;
    43 
    44 
    4540
    4641#define true 1
  • trunk/source/lisp-kernel/platform-androidarm.h

    r14574 r16134  
    2222
    2323typedef struct ucontext ExceptionInformation;
    24 
    25 #include "standard-inttypes.h"
    26 
    2724
    2825#define MAXIMUM_MAPPABLE_MEMORY ((3<<28)-(1<<16))
  • trunk/source/lisp-kernel/platform-darwinarm.h

    r14189 r16134  
    2626typedef ucontext_t ExceptionInformation;
    2727
    28 #include "standard-inttypes.h"
    29 
    30 
    3128#define MAXIMUM_MAPPABLE_MEMORY (256<<20) /* uh, no */
    3229#define IMAGE_BASE_ADDRESS 0x04001000
  • trunk/source/lisp-kernel/platform-darwinx8632.h

    r16072 r16134  
    2828typedef mcontext_t MCONTEXT_T;
    2929typedef ucontext_t ExceptionInformation;
    30 
    31 #include "standard-inttypes.h"
    3230
    3331#define MAXIMUM_MAPPABLE_MEMORY ((1U<<31)-2*heap_segment_size)
     
    8280#include <mach/machine/thread_status.h>
    8381
    84 pthread_mutex_t *mach_exception_lock;
    85 
    8682#include "os-darwin.h"
    8783
  • trunk/source/lisp-kernel/platform-darwinx8664.h

    r16072 r16134  
    2929typedef ucontext_t ExceptionInformation;
    3030#define UC_MCONTEXT(UC) UC->uc_mcontext
    31 
    32 #include "standard-inttypes.h"
    3331
    3432#define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
     
    8987#include <mach/machine/thread_status.h>
    9088
    91 pthread_mutex_t *mach_exception_lock;
    92 
    9389#include "os-darwin.h"
    9490
  • trunk/source/lisp-kernel/platform-freebsdx8632.h

    r15700 r16134  
    2222
    2323typedef struct __ucontext ExceptionInformation;
    24 
    25 #include "standard-inttypes.h"
    26 
    2724
    2825#define MAXIMUM_MAPPABLE_MEMORY (1U<<30)
  • trunk/source/lisp-kernel/platform-freebsdx8664.h

    r15735 r16134  
    2222
    2323typedef struct __ucontext ExceptionInformation;
    24 
    25 #include "standard-inttypes.h"
    2624
    2725#define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
  • trunk/source/lisp-kernel/platform-linuxarm.h

    r16087 r16134  
    2222
    2323typedef struct ucontext ExceptionInformation;
    24 
    25 #include "standard-inttypes.h"
    26 
    2724
    2825#define MAXIMUM_MAPPABLE_MEMORY (3<<29)
  • trunk/source/lisp-kernel/platform-linuxppc.h

    r13649 r16134  
    2222
    2323typedef struct ucontext ExceptionInformation;
    24 
    25 #include "standard-inttypes.h"
    26 
    2724
    2825#define MAXIMUM_MAPPABLE_MEMORY (1U<<30)
  • trunk/source/lisp-kernel/platform-linuxppc64.h

    r13649 r16134  
    2222
    2323typedef struct ucontext ExceptionInformation;
    24 
    25 #include "standard-inttypes.h"
    2624
    2725#define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
  • trunk/source/lisp-kernel/platform-linuxx8632.h

    r13952 r16134  
    2323typedef struct ucontext ExceptionInformation;
    2424
    25 #include "standard-inttypes.h"
    26 
    27 
    2825#define MAXIMUM_MAPPABLE_MEMORY (9U<<28)
    2926#define IMAGE_BASE_ADDRESS 0x10000000
  • trunk/source/lisp-kernel/platform-linuxx8664.h

    r13952 r16134  
    2323typedef struct ucontext ExceptionInformation;
    2424
    25 #include "standard-inttypes.h"
    26 
    2725#define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
    2826#define IMAGE_BASE_ADDRESS 0x300000000000L
  • trunk/source/lisp-kernel/platform-solarisx64.h

    r13960 r16134  
    2323typedef struct ucontext ExceptionInformation;
    2424
    25 #include "solaris-inttypes.h"
    26 
    2725#define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
    2826#define IMAGE_BASE_ADDRESS 0x300000000000L
  • trunk/source/lisp-kernel/platform-solarisx86.h

    r15147 r16134  
    2222
    2323typedef struct ucontext ExceptionInformation;
    24 
    25 #include "solaris-inttypes.h"
    2624
    2725#define MAXIMUM_MAPPABLE_MEMORY (1U<<30)
  • trunk/source/lisp-kernel/platform-win32.h

    r15147 r16134  
    2323#include <windows.h>
    2424typedef CONTEXT ExceptionInformation;
    25 
    26 #include "windows-inttypes.h"
    27 
    2825
    2926#define MAXIMUM_MAPPABLE_MEMORY (1U<<30)
  • trunk/source/lisp-kernel/platform-win64.h

    r15147 r16134  
    2424
    2525typedef CONTEXT ExceptionInformation;
    26 
    27 #include "windows-inttypes.h"
    2826
    2927/* Supposedly, the high-end version of Vista allow 128GB of pageable memory */
  • trunk/source/lisp-kernel/plsym.c

    r13496 r16134  
    2626  sym += (fulltag_symbol-fulltag_misc);
    2727#endif
    28   Dprintf("Symbol %s at #x%llX", print_lisp_object(sym), (u64_t) sym);
     28  Dprintf("Symbol %s at #x%llX", print_lisp_object(sym), (long long)sym);
    2929  Dprintf("  value    : %s", print_lisp_object(rawsym->vcell));
    3030  if (function != nrs_UDF.vcell) {
  • trunk/source/lisp-kernel/pmcl-kernel.c

    r16085 r16134  
    11601160  }
    11611161  fprintf(dbgout, "\t-R, --heap-reserve <n>: reserve <n> (default: %lld)\n",
    1162           (u64_t) reserved_area_size);
     1162          (long long)reserved_area_size);
    11631163  fprintf(dbgout, "\t\t bytes for heap expansion\n");
    11641164  fprintf(dbgout, "\t-S, --stack-size <n>: set  size of initial thread's control stack to <n>\n");
  • trunk/source/lisp-kernel/x86-constants32.h

    r16085 r16134  
    347347  LispObj save3;
    348348  LispObj *save_fp;             /* EBP when in foreign code */
    349   u32_t lisp_mxcsr;
    350   u32_t foreign_mxcsr;
     349  uint32_t lisp_mxcsr;
     350  uint32_t foreign_mxcsr;
    351351  special_binding *db_link;     /* special binding chain head */
    352352  LispObj catch_top;            /* top catch frame */
  • trunk/source/lisp-kernel/x86-constants64.h

    r16085 r16134  
    284284  struct tcr* prev;
    285285  struct {
    286     u32_t tag;
     286    uint32_t tag;
    287287    float f;
    288288  } single_float_convert;
    289289  struct tcr* linear;
    290290  LispObj *save_fp;            /* RBP when in foreign code */
    291   u32_t lisp_mxcsr;
    292   u32_t foreign_mxcsr;
     291  uint32_t lisp_mxcsr;
     292  uint32_t foreign_mxcsr;
    293293  special_binding* db_link;     /* special binding chain head */
    294294  LispObj catch_top;            /* top catch frame */
  • trunk/source/lisp-kernel/x86-exceptions.c

    r16133 r16134  
    131131  char *last = tcr->last_allocptr;
    132132  char *current = cur_allocptr;
    133   u64_t *bytes_allocated = (u64_t *)&TCR_AUX(tcr)->bytes_allocated;
     133  uint64_t *bytes_allocated = (uint64_t *)&TCR_AUX(tcr)->bytes_allocated;
    134134
    135135  if (last && (tcr->save_allocbase != ((void *)VOID_ALLOCPTR))) {
  • trunk/source/lisp-kernel/x86-exceptions.h

    r16072 r16134  
    1818#define X86_EXCEPTIONS_H 1
    1919
    20 typedef u8_t opcode, *pc;
     20typedef uint8_t opcode, *pc;
    2121
    2222void switch_to_foreign_stack(void*, ...);
  • trunk/source/lisp-kernel/x86_print.c

    r15373 r16134  
    323323nth_immediate(LispObj o, unsigned n)
    324324{
    325   u16_t imm_word_count = *(u16_t *)(o + misc_data_offset);
     325  uint16_t imm_word_count = *(uint16_t *)(o + misc_data_offset);
    326326  natural *constants = (natural *)((char *)o + misc_data_offset + (imm_word_count << 2));
    327327  LispObj result = (LispObj)(constants[n-1]);
Note: See TracChangeset for help on using the changeset viewer.