Changeset 13627


Ignore:
Timestamp:
Apr 15, 2010, 4:40:30 AM (10 years ago)
Author:
gb
Message:

Include lisptypes.h and word-size/arch-specific constants file in platform
header; don't include lisptypes/*constants from lisp.h.

Whatever seemed to make it necessary to include dyld.h early on Darwin
seems to be gone (assuming that these changes actually compile and run
on all platforms.)

Location:
trunk/source/lisp-kernel
Files:
22 edited

Legend:

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

    r13608 r13627  
    2121/* a platform-specific header file is pre-included via -include */
    2222
    23 #include "lisptypes.h"
    2423#ifndef LOWMEM_BIAS
    25 #define LOWMEM_BIAS 0
     24#define LOWMEM_BIAS (0)
    2625#endif
    2726
    28 #ifdef PPC
    29 #include "ppc-constants.h"
    30 #endif
    31 #ifdef X86
    32 #include "x86-constants.h"
    33 #endif
     27
    3428#include "macros.h"
    3529
  • trunk/source/lisp-kernel/platform-darwinppc.h

    r13617 r13627  
    3434#define IMAGE_BASE_ADDRESS 0x04000000
    3535
     36#include "lisptypes.h"
     37#include "ppc-constants32.h"
  • trunk/source/lisp-kernel/platform-darwinppc64.h

    r13617 r13627  
    3434#define IMAGE_BASE_ADDRESS 0x300000000000L
    3535
     36#include "lisptypes.h"
     37#include "ppc-constants64.h"
  • trunk/source/lisp-kernel/platform-darwinx8632.h

    r13617 r13627  
    3434#define IMAGE_BASE_ADDRESS 0x04000000
    3535
     36#include "lisptypes.h"
     37#include "x86-constants32.h"
  • trunk/source/lisp-kernel/platform-darwinx8664.h

    r13617 r13627  
    3535#define IMAGE_BASE_ADDRESS 0x300000000000L
    3636
     37#include "lisptypes.h"
     38#include "x86-constants64.h"
  • trunk/source/lisp-kernel/platform-freebsdx8632.h

    r13617 r13627  
    2929#define IMAGE_BASE_ADDRESS 0x30000000
    3030
     31#include "lisptypes.h"
     32#include "x86-constants32.h"
  • trunk/source/lisp-kernel/platform-freebsdx8664.h

    r13617 r13627  
    2828#define IMAGE_BASE_ADDRESS 0x300000000000L
    2929
     30#include "lisptypes.h"
     31#include "x86-constants64.h"
  • trunk/source/lisp-kernel/platform-linuxppc.h

    r13617 r13627  
    2929#define IMAGE_BASE_ADDRESS 0x31000000
    3030
     31#include "lisptypes.h"
     32#include "ppc-constants32.h"
  • trunk/source/lisp-kernel/platform-linuxppc64.h

    r13617 r13627  
    2828#define IMAGE_BASE_ADDRESS 0x50000000000L
    2929
     30#include "lisptypes.h"
     31#include "ppc-constants64.h"
  • trunk/source/lisp-kernel/platform-linuxx8632.h

    r13617 r13627  
    2929#define IMAGE_BASE_ADDRESS 0x10000000
    3030
     31#include "lisptypes.h"
     32#include "x86-constants32.h"
  • trunk/source/lisp-kernel/platform-linuxx8664.h

    r13617 r13627  
    2727#define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
    2828#define IMAGE_BASE_ADDRESS 0x300000000000L
     29
     30#include "lisptypes.h"
     31#include "x86-constants64.h"
  • trunk/source/lisp-kernel/platform-solarisx64.h

    r13617 r13627  
    2727#define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
    2828#define IMAGE_BASE_ADDRESS 0x300000000000L
     29
     30#include "lisptypes.h"
     31#include "x86-constants64.h"
  • trunk/source/lisp-kernel/platform-solarisx86.h

    r13617 r13627  
    2828#define IMAGE_BASE_ADDRESS 0x10000000
    2929
     30#include "lisptypes.h"
     31#include "x86-constants32.h"
  • trunk/source/lisp-kernel/platform-win32.h

    r13617 r13627  
    3030#define IMAGE_BASE_ADDRESS 0x04000000
    3131
     32#include "lisptypes.h"
     33#include "x86-constants32.h"
  • trunk/source/lisp-kernel/platform-win64.h

    r13617 r13627  
    3131#define IMAGE_BASE_ADDRESS 0x100000000LL
    3232
    33 
     33#include "lisptypes.h"
     34#include "x86-constants64.h"
  • trunk/source/lisp-kernel/pmcl-kernel.c

    r13617 r13627  
    2020    a conflict (actually I think the problem is in "constants.h")
    2121*/
    22 #include <mach-o/dyld.h>
     22/* #include <mach-o/dyld.h> */
    2323
    2424#endif
  • trunk/source/lisp-kernel/ppc-constants.h

    r13617 r13627  
    1616*/
    1717
    18 #ifndef __ppc_constants__
    19 #define __ppc_constants__ 1
     18#include "constants.h"
    2019
    2120/*  Register usage: */
     
    6362#define BA_VAL  ((unsigned) ((18<<26) | (1<<1)))
    6463
    65 #define TCR_FLAG_BIT_FOREIGN fixnumshift
    66 #define TCR_FLAG_BIT_AWAITING_PRESET (fixnumshift+1)
    67 #define TCR_FLAG_BIT_ALT_SUSPEND (fixnumshift+2)
    68 #define TCR_FLAG_BIT_PROPAGATE_EXCEPTION (fixnumshift+3)
    69 #define TCR_FLAG_BIT_SUSPEND_ACK_PENDING (fixnumshift+4)
    70 #define TCR_FLAG_BIT_PENDING_EXCEPTION (fixnumshift+5)
    71 #define TCR_FLAG_BIT_FOREIGN_EXCEPTION (fixnumshift+6)
    72 #define TCR_FLAG_BIT_PENDING_SUSPEND (fixnumshift+7)
    7364
    74 #define TCR_STATE_FOREIGN (1)
    75 #define TCR_STATE_LISP    (0)
    76 #define TCR_STATE_EXCEPTION_WAIT (2)
    77 #define TCR_STATE_EXCEPTION_RETURN (4)
    78 
    79 #ifdef PPC64
    80 #include "ppc-constants64.h"
    81 #else
    82 #include "ppc-constants32.h"
    83 #endif
    84 
    85 #define dnode_size (node_size*2)
    86 #define dnode_shift (node_shift+1)
    87 
    88 #define INTERRUPT_LEVEL_BINDING_INDEX (1)
    8965#define STATIC_BASE_ADDRESS 0x00002000
    9066
    91 #endif /* __ppc_constants__ */
    9267
    9368
  • trunk/source/lisp-kernel/ppc-constants32.h

    r13067 r13627  
    1818#ifndef __constants32__
    1919#define __constants32__ 1
     20
     21#include "ppc-constants.h"
     22
    2023
    2124#define rcontext 13
  • trunk/source/lisp-kernel/ppc-constants64.h

    r13067 r13627  
    1616*/
    1717
    18 #ifndef __constants64__
    19 #define __constants64__ 1
     18
     19#include "ppc-constants.h"
    2020
    2121#define rcontext 2
     
    453453#define log2_heap_segment_size 17L
    454454
    455 #endif
    456 
  • trunk/source/lisp-kernel/x86-constants.h

    r13617 r13627  
    1515*/
    1616
    17 #ifndef __x86_constants__
    18 #define __x86_constants__ 1
     17#include "constants.h"
    1918
    20 #define TCR_FLAG_BIT_FOREIGN fixnumshift
    21 #define TCR_FLAG_BIT_AWAITING_PRESET (fixnumshift+1)
    22 #define TCR_FLAG_BIT_ALT_SUSPEND (fixnumshift+2)
    23 #define TCR_FLAG_BIT_PROPAGATE_EXCEPTION (fixnumshift+3)
    24 #define TCR_FLAG_BIT_SUSPEND_ACK_PENDING (fixnumshift+4)
    25 #define TCR_FLAG_BIT_PENDING_EXCEPTION (fixnumshift+5)
    26 #define TCR_FLAG_BIT_FOREIGN_EXCEPTION (fixnumshift+6)
    27 #define TCR_FLAG_BIT_PENDING_SUSPEND (fixnumshift+7)
    28 #define TCR_STATE_FOREIGN (1)
    29 #define TCR_STATE_LISP    (0)
    30 #define TCR_STATE_EXCEPTION_WAIT (2)
    31 #define TCR_STATE_EXCEPTION_RETURN (4)
    32 
    33 #ifdef X8664
    34 #include "x86-constants64.h"
    35 #else
    36 #include "x86-constants32.h"
    37 #endif
    38 
    39 #define dnode_size (node_size*2)
    40 #define dnode_shift (node_shift+1)
    41 
    42 #define INTERRUPT_LEVEL_BINDING_INDEX (1)
    4319
    4420/* FP exception mask bits */
    4521#define MXCSR_IM_BIT (7)        /* invalid masked when set*/
    46 #define MXCSR_DM_BIT (8)        /* denormals masked when set*/
     22#define MXCSR_DM_BIT (8)        /* denormals masked when set*
    4723#define MXCSR_ZM_BIT (9)        /* divide-by-zero masked when set */
    4824#define MXCSR_OM_BIT (10)       /* overflow masked when set */
     
    6238
    6339
    64 #endif /* __x86_constants__ */
    6540
  • trunk/source/lisp-kernel/x86-constants32.h

    r12744 r13627  
     1/*
     2   Copyright (C) 2009 Clozure Associates
     3   Copyright (C) 1994-2001 Digitool, Inc
     4   This file is part of Clozure CL. 
     5
     6   Clozure CL is licensed under the terms of the Lisp Lesser GNU Public
     7   License , known as the LLGPL and distributed with Clozure CL as the
     8   file "LICENSE".  The LLGPL consists of a preamble and the LGPL,
     9   which is distributed with Clozure CL as the file "LGPL".  Where these
     10   conflict, the preamble takes precedence. 
     11
     12   Clozure CL is referenced in the preamble as the "LIBRARY."
     13
     14   The LLGPL is also available online at
     15   http://opensource.franz.com/preamble.html
     16*/
     17
     18#include "x86-constants.h"
     19
    120/* offsets into uc_mcontext.ss */
    221#ifdef DARWIN
  • trunk/source/lisp-kernel/x86-constants64.h

    r13067 r13627  
    1414   http://opensource.franz.com/preamble.html
    1515*/
     16
     17#include "x86-constants.h"
    1618
    1719#ifdef DARWIN
Note: See TracChangeset for help on using the changeset viewer.