VirtualBox

Changeset 7133 in vbox


Ignore:
Timestamp:
Feb 25, 2008 6:20:27 PM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
28394
Message:

Eliminate cpum.h dependency (shuts up a bunch of .c warnings). Fixed the header tests.

Location:
trunk/include
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/Makefile.kmk

    r5999 r7133  
    2222LIBRARIES = SyntaxVBoxIncludeR3 SyntaxVBoxIncludeR0 SyntaxVBoxIncludeGC
    2323
    24 hdrs := $(wildcard VBox/*.h iprt/*.h)
     24cpp_hdrs := \
     25        VBox/dbggui.h \
     26        VBox/settings.h \
     27        iprt/cpputils.h \
     28        iprt/lock.h
    2529
    26 SyntaxVBoxIncludeR3_TEMPLATE = VBOXR3
     30r3_only_hdrs := \
     31        VBox/vrdpapi.h \
     32        VBox/vrdpusb.h \
     33        VBox/VBoxHDD-new.h \
     34        VBox/VBoxHDD.h \
     35        iprt/tcp.h \
     36
     37hdrs := $(filter-out \
     38        VBox/VBoxGuest16.h \
     39        VBox/tapwin32.h \
     40        VBox/usblib-win.h, \
     41        $(wildcard VBox/*.h iprt/*.h))
     42
     43hdrs.r3 := $(filter-out VBox/VBoxGuestLib.h, $(hdrs))
     44hdrs.r0 := $(filter-out $(cpp_hdrs) $(r3_only_hdrs), $(hdrs))
     45hdrs.gc := $(filter-out \
     46        VBox/VBoxGuestLib.h \
     47        VBox/gvm.h \
     48        iprt/thread.h \
     49        iprt/mem.h \
     50        iprt/alloc.h \
     51        $(cpp_hdrs) $(r3_only_hdrs), \
     52        $(hdrs))
     53
     54SyntaxVBoxIncludeR3_TEMPLATE = VBOXMAINEXE
     55SyntaxVBoxIncludeR3_DEFS = VBOX_HGCM
    2756SyntaxVBoxIncludeR3_SOURCES := \
    28         $(addprefix $(PATH_TARGET)/,$(subst .h,-c.c,     $(subst /,_,$(hdrs)))) \
    29         $(addprefix $(PATH_TARGET)/,$(subst .h,-cpp.cpp, $(subst /,_,$(hdrs))))
     57        $(addprefix $(PATH_TARGET)/,$(subst .h,-c.c,     $(subst /,_,$(hdrs.r3)))) \
     58        $(addprefix $(PATH_TARGET)/,$(subst .h,-cpp.cpp, $(subst /,_,$(hdrs.r3))))
    3059
    3160SyntaxVBoxIncludeR0_TEMPLATE = VBOXR0
    32 SyntaxVBoxIncludeR0_SOURCES = $(SyntaxVBoxIncludeR3_SOURCES)
     61SyntaxVBoxIncludeR0_DEFS = VBOX_HGCM
     62SyntaxVBoxIncludeR0_SOURCES := \
     63        $(addprefix $(PATH_TARGET)/,$(subst .h,-c.c,     $(subst /,_,$(hdrs.r0)))) \
     64        $(addprefix $(PATH_TARGET)/,$(subst .h,-cpp.cpp, $(subst /,_,$(hdrs.r0))))
    3365
    3466SyntaxVBoxIncludeGC_TEMPLATE = VBOXGC
    35 SyntaxVBoxIncludeGC_SOURCES = $(SyntaxVBoxIncludeR3_SOURCES)
     67SyntaxVBoxIncludeGC_DEFS = VBOX_HGCM
     68SyntaxVBoxIncludeGC_SOURCES := \
     69        $(addprefix $(PATH_TARGET)/,$(subst .h,-c.c,     $(subst /,_,$(hdrs.gc)))) \
     70        $(addprefix $(PATH_TARGET)/,$(subst .h,-cpp.cpp, $(subst /,_,$(hdrs.gc))))
    3671
    3772
    … …  
    4883        $$(APPEND) $$@ "int main(int argc, char **argv) {(void)argc; (void)argv; return 0;}"
    4984
    50 $$(PATH_TARGET)/$(flatname)-c.c:
     85$$(PATH_TARGET)/$(flatname)-c.c: Makefile.kmk
    5186        $$(MKDIR) -p $$(dir $$@)
    5287        $$(RM) -f $$@
     88ifn1of ($(hdr),$(cpp_hdrs))
    5389        $$(APPEND) $$@ "#include <$(hdr)>"
     90endif
    5491        $$(APPEND) $$@ "int main(int argc, char **argv) {(void)argc; (void)argv; return 0;}"
    5592

  • trunk/include/VBox/VRDPOrders.h

    r7028 r7133  
    2727#ifndef ___VBox_vrdporders_h
    2828#define ___VBox_vrdporders_h
     29
     30#include <iprt/types.h>
    2931
    3032/*
    … …  
    251253    uint32_t o32NextGlyph;
    252254    uint64_t u64Handle;
    253    
     255
    254256    /* The glyph origin position on the screen. */
    255257    int16_t  x;
    256258    int16_t  y;
    257    
     259
    258260    /* The glyph bitmap dimensions. Note w == h == 0 for the space character. */
    259261    uint16_t w;
    … …  
    263265    int16_t  xOrigin;
    264266    int16_t  yOrigin;
    265    
     267
    266268    /* 1BPP bitmap. Rows are byte aligned. Size is (((w + 7)/8) * h + 3) & ~3. */
    267269    uint8_t au8Bitmap[1];

  • trunk/include/VBox/cpum.h

    r7097 r7133  
    4141 * Selector hidden registers.
    4242 */
    43 typedef struct CPUMSELREGHIDDEN
     43typedef struct CPUMSELREGHID
    4444{
    4545    /** Base register. */
    … …  
    5252    X86DESCATTR Attr;
    5353} CPUMSELREGHID;
    54 /** Pointer to selector hidden registers. */
    55 typedef CPUMSELREGHID *PCPUMSELREGHID;
    56 /** Pointer to const selector hidden registers. */
    57 typedef const CPUMSELREGHID *PCCPUMSELREGHID;
    5854
    5955
    … …  
    166162
    167163} CPUMCTXCORE;
    168 /** Pointer to CPU context core. */
    169 typedef CPUMCTXCORE *PCPUMCTXCORE;
    170 /** Pointer to const CPU context core. */
    171 typedef const CPUMCTXCORE *PCCPUMCTXCORE;
    172164#pragma pack()
     165
    173166
    174167/**
    … …  
    323316} CPUMCTX;
    324317#pragma pack()
    325 /** Pointer to CPUMCTX. */
    326 typedef CPUMCTX *PCPUMCTX;
    327318
    328319/**

  • trunk/include/VBox/csam.h

    r5999 r7133  
    2929#include <VBox/cdefs.h>
    3030#include <VBox/types.h>
    31 #include <VBox/cpum.h>
    3231#include <VBox/em.h>
    3332
    … …  
    230229 * @param   pInstrGC    Instruction pointer
    231230 */
    232 CSAMR3DECL(int) CSAMR3CheckCodeEx(PVM pVM, RTSEL Sel, CPUMSELREGHID *pHiddenSel, RTGCPTR pInstrGC);
     231CSAMR3DECL(int) CSAMR3CheckCodeEx(PVM pVM, RTSEL Sel, PCPUMSELREGHID pHiddenSel, RTGCPTR pInstrGC);
    233232
    234233/**

  • trunk/include/VBox/em.h

    r6210 r7133  
    3030#include <VBox/types.h>
    3131#include <VBox/trpm.h>
    32 #include <VBox/cpum.h>
    3332#include <VBox/dis.h>
    3433

  • trunk/include/VBox/hwacc_svm.h

    r6243 r7133  
    2929#include <VBox/types.h>
    3030#include <VBox/err.h>
    31 #include <VBox/cpum.h>
    3231#include <iprt/assert.h>
    3332#include <iprt/asm.h>

  • trunk/include/VBox/hwacc_vmx.h

    r5999 r7133  
    2929#include <VBox/types.h>
    3030#include <VBox/err.h>
    31 #include <VBox/cpum.h>
    3231#include <iprt/assert.h>
    3332#include <iprt/asm.h>

  • trunk/include/VBox/iom.h

    r5999 r7133  
    2929#include <VBox/cdefs.h>
    3030#include <VBox/types.h>
    31 #include <VBox/cpum.h>
    3231#include <VBox/dis.h>
    3332

  • trunk/include/VBox/patm.h

    r5999 r7133  
    2929#include <VBox/cdefs.h>
    3030#include <VBox/types.h>
    31 #include <VBox/cpum.h>
    3231#include <VBox/dis.h>
    3332

  • trunk/include/VBox/pgm.h

    r6915 r7133  
    3030#include <VBox/types.h>
    3131#include <VBox/sup.h>
    32 #include <VBox/cpum.h>
    3332#include <VBox/vmapi.h>
     33#include <VBox/x86.h>
    3434
    3535__BEGIN_DECLS

  • trunk/include/VBox/selm.h

    r5999 r7133  
    2929#include <VBox/cdefs.h>
    3030#include <VBox/types.h>
    31 #include <VBox/cpum.h>
     31#include <VBox/x86.h>
    3232
    3333

  • trunk/include/VBox/trpm.h

    r5999 r7133  
    2929#include <VBox/cdefs.h>
    3030#include <VBox/types.h>
    31 #include <VBox/cpum.h>
     31#include <VBox/x86.h>
    3232
    3333

  • trunk/include/VBox/types.h

    r7072 r7133  
    174174/** SSM Operation handle. */
    175175typedef struct SSMHANDLE *PSSMHANDLE;
     176
     177/** Pointer to a CPUMCTX. */
     178typedef struct CPUMCTX *PCPUMCTX;
     179/** Pointer to a const CPUMCTX. */
     180typedef const struct CPUMCTX *PCCPUMCTX;
     181
     182/** Pointer to a CPU context core. */
     183typedef struct CPUMCTXCORE *PCPUMCTXCORE;
     184/** Pointer to a const CPU context core. */
     185typedef const struct CPUMCTXCORE *PCCPUMCTXCORE;
     186
     187/** Pointer to selector hidden registers. */
     188typedef struct CPUMSELREGHID *PCPUMSELREGHID;
     189/** Pointer to const selector hidden registers. */
     190typedef const struct CPUMSELREGHID *PCCPUMSELREGHID;
    176191
    177192/** @} */

  • trunk/include/VBox/vmapi.h

    r6835 r7133  
    2929#include <VBox/cdefs.h>
    3030#include <VBox/types.h>
    31 #include <VBox/cpum.h>
    3231#include <VBox/stam.h>
    3332#include <VBox/cfgm.h>

  • trunk/include/iprt/req.h

    r5999 r7133  
    8686} RTREQFLAGS;
    8787
    88 /* Forward declaration. */
    89 struct RTREQQUEUE;
     88/** Pointer to a request queue. */
     89typedef struct RTREQQUEUE *PRTREQQUEUE;
    9090
    9191/**
    … …  
    9999    struct RTREQ * volatile pNext;
    100100    /** Pointer to the queue this packet belongs to. */
    101     RTREQQUEUE             *pQueue;
     101    PRTREQQUEUE             pQueue;
    102102    /** Request state. */
    103103    volatile RTREQSTATE     enmState;
    … …  
    149149    RTSEMEVENT              EventSem;
    150150} RTREQQUEUE;
    151 /** Pointer to a request queue */
    152 typedef RTREQQUEUE *PRTREQQUEUE;
    153151
    154152#ifdef IN_RING3

  • trunk/include/iprt/runtime.h

    r5999 r7133  
    3232#include <iprt/initterm.h>
    3333
    34 #include <iprt/alloc.h>
     34#ifndef IN_GC
     35# include <iprt/alloc.h>
     36#endif
    3537#include <iprt/asm.h>
    3638#include <iprt/assert.h>
    … …  
    4143#include <iprt/dir.h>
    4244#include <iprt/err.h>
    43 #include <iprt/file.h>
    44 #include <iprt/fs.h>
     45#ifndef IN_GC
     46# include <iprt/file.h>
     47# include <iprt/fs.h>
     48#endif
    4549#include <iprt/ldr.h>
    4650#include <iprt/log.h>
    4751#include <iprt/md5.h>
    48 #include <iprt/mem.h>
     52#ifndef IN_GC
     53# include <iprt/mem.h>
     54#endif
    4955#include <iprt/path.h>
    5056#include <iprt/semaphore.h>
    … …  
    5460#include <iprt/system.h>
    5561#include <iprt/table.h>
    56 #include <iprt/thread.h>
     62#ifndef IN_GC
     63# include <iprt/thread.h>
     64#endif
    5765#include <iprt/time.h>
    5866#include <iprt/timer.h>
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette