Changeset 3526 for trunk


Ignore:
Timestamp:
Aug 20, 2007, 12:46:14 AM (18 years ago)
Author:
bird
Message:

made it build again.

Location:
trunk/kProfile
Files:
1 added
7 edited
3 copied
4 moved

Legend:

Unmodified
Added
Removed

  • trunk/kProfile/Makefile.kmk

    r3524 r3526  
    2525#
    2626
    27 
    28 DEPTH = ../../../..
     27DEPTH = ..
    2928include $(PATH_KBUILD)/header.kmk
    3029
    3130#LIBRARIES   = kPrf2GC kPrf2R0
    3231DLLS        = kPrf2
    33 PROGRAMS    = kPrf2Read tst
     32PROGRAMS    = kPrf2Read
    3433
    3534
    … …  
    4039TEMPLATE_kPrf2_TOOL             = GCC3
    4140TEMPLATE_kPrf2_TOOL.os2         = GCC3OMF
    42 TEMPLATE_kPrf2_TOOL.win32       = VCC70
    43 TEMPLATE_kPrf2_ASTOOL           = NASM
     41TEMPLATE_kPrf2_TOOL.win.x86     = VCC70
     42TEMPLATE_kPrf2_TOOL.win.amd64   = VCC80AMD64
     43TEMPLATE_kPrf2_ASTOOL           = YASM
     44TEMPLATE_kPrf2_ASTOOL.os2       = NASM
    4445
    45 TEMPLATE_kPrf2_DEFS.freebsd     = __FREEBSD__
    46 TEMPLATE_kPrf2_DEFS.l4          = __L4__
    47 TEMPLATE_kPrf2_DEFS.linux       = __LINUX__
    48 TEMPLATE_kPrf2_DEFS.os2         = __OS2__
    49 TEMPLATE_kPrf2_DEFS.win32       = __WIN32__
    50 TEMPLATE_kPrf2_DEFS.win64       = __WIN64__
     46TEMPLATE_kPrf2_SDKS.win         = WINPSDK
     47
     48TEMPLATE_kPrf2_DEFS.freebsd     = KPRF_OS_FREEBSD
     49TEMPLATE_kPrf2_DEFS.linux       = KPRF_OS_LINUX
     50TEMPLATE_kPrf2_DEFS.os2         = KPRF_OS_OS2
     51TEMPLATE_kPrf2_DEFS.win         = KPRF_OS_WINDOWS
    5152
    5253TEMPLATE_kPrf2_CXXFLAGS.freebsd = -g
    53 TEMPLATE_kPrf2_CXXFLAGS.l4      = -g
    5454TEMPLATE_kPrf2_CXXFLAGS.linux   = -g
    5555TEMPLATE_kPrf2_CXXFLAGS.os2     = -g
    56 TEMPLATE_kPrf2_CXXFLAGS.win32   = -Zi -Zl -MD -W3 -GF -GR-
     56TEMPLATE_kPrf2_CXXFLAGS.win     = -Zi -Zl -MD -W3 -GF -GR-
    5757ifneq ($(BUILD_TYPE),debug)
    5858TEMPLATE_kPrf2_CXXFLAGS.freebsd+= -O3
    59 TEMPLATE_kPrf2_CXXFLAGS.l4     += -O3
    6059TEMPLATE_kPrf2_CXXFLAGS.linux  += -O3
    6160TEMPLATE_kPrf2_CXXFLAGS.os2    += -O3
    62 TEMPLATE_kPrf2_CXXFLAGS.win32  += -O2xtg -Oi -Ob2
     61TEMPLATE_kPrf2_CXXFLAGS.win    += -O2xtg -Oi -Ob2
    6362endif
    64 TEMPLATE_kPrf2_CXXFLAGS.win64   = $(TEMPLATE_kPrf2_CXXFLAGS.win32)
    6563
    66 TEMPLATE_kPrf2_ASFLAGS.freebsd  = -f elf32 -g
    67 TEMPLATE_kPrf2_ASFLAGS.l4       = -f elf32 -g
    68 TEMPLATE_kPrf2_ASFLAGS.linux    = -f elf32 -g
     64TEMPLATE_kPrf2_ASFLAGS.freebsd  = -f elf
     65TEMPLATE_kPrf2_ASFLAGS.linux    = -f elf
    6966TEMPLATE_kPrf2_ASFLAGS.os2      = -f omf
    70 TEMPLATE_kPrf2_ASFLAGS.win32    = -f win32 -g
     67TEMPLATE_kPrf2_ASFLAGS.win.x86  = -f win32 -g cv8
     68TEMPLATE_kPrf2_ASFLAGS.win.amd64 = -f win64 -g cv8
    7169
    72 TEMPLATE_kPrf2_INCS.win32           = \
    73         $(PATH_DEV)/x86.win32/vcc70/include \
    74         $(PATH_DEV)/x86.win32/sdk200209/include
     70#TEMPLATE_kPrf2_INCS.win            = \
     71#       $(PATH_DEV)/x86.win32/vcc70/include \
     72#       $(PATH_DEV)/x86.win32/sdk200209/include
    7573
    7674TEMPLATE_kPrf2_LDFLAGS.freebsd  = -g
    77 TEMPLATE_kPrf2_LDFLAGS.l4       = -g
    7875TEMPLATE_kPrf2_LDFLAGS.linux    = -g
    7976TEMPLATE_kPrf2_LDFLAGS.os2      = -g
    80 TEMPLATE_kPrf2_LDFLAGS.win32    = /DEBUG
    81 TEMPLATE_kPrf2_LDFLAGS.win64    = /DEBUG
     77TEMPLATE_kPrf2_LDFLAGS.win      = /DEBUG
    8278
    8379TEMPLATE_kPrf2_LIBS.freebsd     =
    84 TEMPLATE_kPrf2_LIBS.l4          =
    8580TEMPLATE_kPrf2_LIBS.linux       =
    8681TEMPLATE_kPrf2_LIBS.os2         =
    87 TEMPLATE_kPrf2_LIBS.win32       = \
     82TEMPLATE_kPrf2_LIBS.win        = \
     83        $(PATH_SDK_WINPSDK_LIB)/psapi.Lib
     84TEMPLATE_kPrf2_LIBS.win.x86     = \
    8885        $(PATH_TOOL_VCC70_LIB)/msvcrt.lib \
    8986        $(PATH_TOOL_VCC70_LIB)/msvcprt.lib \
    90         $(PATH_TOOL_VCC70_LIB)/oldnames.lib \
    91         $(PATH_DEV)/x86.win32/sdk200209/lib/Kernel32.Lib \
    92         $(PATH_DEV)/x86.win32/sdk200209/lib/psapi.Lib
     87        $(PATH_TOOL_VCC70_LIB)/oldnames.lib
    9388
    9489
    … …  
    105100#       kProfileR0.cpp
    106101
    107 kPrf2_SOURCES.win32 = \
    108         dllmain-win32.cpp \
    109         kPrf2-win32.def \
    110         prfx86msc.asm
    111 prfx86msc.asm_DEFS.win32 = \
     102kPrf2_SOURCES.win = \
     103        dllmain-win.cpp \
     104        prf$(BUILD_TARGET_ARCH)msc.asm \
     105        kPrf2-win-$(BUILD_TARGET_ARCH).def
     106prfx86msc.asm_DEFS.win.x86 = \
    112107        KPRF_ENTER=_KPrfEnter \
    113108        KPRF_LEAVE=_KPrfLeave
    … …  
    119114#
    120115kPrf2Read_TEMPLATE = kPrf2
    121 kPrf2Read_INCS = \
    122         $(PATH_CURRENT)/../include \
    123         $(PATH_ROOT)/include
    124 kPrf2Read_DEFS = IN_RING3 IN_RT_R3
    125116kPrf2Read_SOURCES  = \
    126         kPrf2Read.cpp \
     117        kPrf2Read.cpp
     118
     119# kDbg stuff
     120KDBG_ROOT ?= $(PATH_CURRENT)/../kProfile
     121kPrf2Read_INCS += $(KDBG_ROOT)
     122kPrf2Read_SOURCES += \
    127123        dbgmodule.cpp \
    128124        dbgline.cpp \
    129125        dbgsymbol.cpp
    130 ifeq ($(filter-out win32 win64,$(BUILD_TARGET)),)
    131 kPrf2Read_SOURCES += dbgModPE-win32.cpp
     126ifeq ($(BUILD_TARGET),win)
     127kPrf2Read_SOURCES.win += dbgModPE-win.cpp
    132128else
    133129kPrf2Read_SOURCES += dbgModPE-generic.cpp
    134130endif
    135 kPrf2Read_LIBS  = \
    136         $(LIB_RUNTIME)
    137 kPrf2Read_LIBS.win32 = \
    138         $(PATH_DEV)/x86.win32/sdk200209/lib/uuid.Lib \
    139         $(PATH_DEV)/x86.win32/sdk200209/lib/Version.Lib
     131
     132# kLdr stuff
     133KLDR_ROOT ?= $(PATH_CURRENT)/../kLdr
     134kPrf2Read_INCS += $(KLDR_ROOT)
     135
     136# IPRT stuff
     137VBOX_ROOT ?= y:/coding/vbox/svn/trunk
     138kPrf2Read_INCS += $(VBOX_ROOT)/include
     139kPrf2Read_DEFS += IN_RING3 IN_RT_R3 KDBG_USE_IPRT KCOMMON_ALREADY_INCLUDED_STD_TYPES
     140ifeq ($(BUILD_TARGET),win)
     141kPrf2Read_LIBS = \
     142        $(VBOX_ROOT)/out/$(BUILD_TARGET).$(BUILD_TARGET_ARCH)/$(BUILD_TYPE)/lib/VBoxRT$(SUFF_LIB)
     143else
     144kPrf2Read_LIBS = \
     145        $(VBOX_ROOT)/out/$(BUILD_TARGET).$(BUILD_TARGET_ARCH)/$(BUILD_TYPE)/bin/VBoxRT$(SUFF_DLL)
     146endif
    140147
    141148
    142 
     149#
     150# A simple testcase.
     151#
     152PROGRAMS.win.x86 += tst
    143153tst_TOOL = VCC70
     154tst_SDKS = WINPSDK
    144155tst_CFLAGS = -GH -Gh -Zi -Zl -GR- -GX- -GF- -MD -W3 -wd4244
    145156tst_SOURCES = tst.c
    … …  
    150161        $(PATH_TOOL_VCC70_LIB)/msvcprt.lib \
    151162        $(PATH_TOOL_VCC70_LIB)/oldnames.lib \
    152         $(PATH_DEV)/x86.win32/sdk200209/lib/Kernel32.Lib \
    153163        $(PATH_kPrf2)/kPrf2.lib
    154164

  • trunk/kProfile/dbgModPE-generic.cpp

    r3524 r3526  
    3737#include <iprt/thread.h>
    3838#include <iprt/alloca.h>
     39#include "kDbgBase.h"
    3940#include "DBGInternal.h"
    40 #include "internal/ldrPE.h"
     41#include "kLdrModPE.h"
    4142
    4243
    … …  
    276277     */
    277278    IMAGE_FILE_HEADER FHdr;
    278     int rc = RTFileReadAt(File, offHdr + OFFSETOF(IMAGE_NT_HEADERS32, FileHeader), &FHdr, sizeof(FHdr), NULL);
     279    int rc = RTFileReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, FileHeader), &FHdr, sizeof(FHdr), NULL);
    279280    AssertRCReturn(rc, rc);
    280281
    281282    uint32_t cbImage;
    282283    if (FHdr.SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER32))
    283         rc = RTFileReadAt(File, offHdr + OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader.SizeOfImage),
     284        rc = RTFileReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader.SizeOfImage),
    284285                          &cbImage, sizeof(cbImage), NULL);
    285286    else if (FHdr.SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER64))
    286         rc = RTFileReadAt(File, offHdr + OFFSETOF(IMAGE_NT_HEADERS64, OptionalHeader.SizeOfImage),
     287        rc = RTFileReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS64, OptionalHeader.SizeOfImage),
    287288                          &cbImage, sizeof(cbImage), NULL);
    288289    else
    … …  
    293294     * Allocate the module and read/construct the section headers.
    294295     */
    295     PRTDBGMODPE pModPe = (PRTDBGMODPE)RTMemAlloc(OFFSETOF(RTDBGMODPE, aSections[FHdr.NumberOfSections + 2]));
     296    PRTDBGMODPE pModPe = (PRTDBGMODPE)RTMemAlloc(KDBG_OFFSETOF(RTDBGMODPE, aSections[FHdr.NumberOfSections + 2]));
    296297    AssertReturn(pModPe, VERR_NO_MEMORY);
    297298    pModPe->Core.u32Magic   = RTDBGMOD_MAGIC;
    … …  
    300301    pModPe->cbImage         = cbImage;
    301302    pModPe->cSections       = 1 + FHdr.NumberOfSections;
    302     rc = RTFileReadAt(File, offHdr + OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader) + FHdr.SizeOfOptionalHeader,
     303    rc = RTFileReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader) + FHdr.SizeOfOptionalHeader,
    303304                      &pModPe->aSections[1], sizeof(pModPe->aSections[0]) * FHdr.NumberOfSections, NULL);
    304305    if (RT_SUCCESS(rc))

  • trunk/kProfile/dbgModPE-win.cpp

    r3524 r3526  
    4141#include <iprt/thread.h>
    4242#include <iprt/alloca.h>
     43#include "kDbgBase.h"
    4344#include "DBGInternal.h"
    4445
    … …  
    561562     */
    562563    IMAGE_FILE_HEADER FHdr;
    563     int rc = RTFileReadAt(File, offHdr + OFFSETOF(IMAGE_NT_HEADERS32, FileHeader), &FHdr, sizeof(FHdr), NULL);
     564    int rc = RTFileReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, FileHeader), &FHdr, sizeof(FHdr), NULL);
    564565    AssertRCReturn(rc, rc);
    565566
    566567    uint32_t cbImage;
    567568    if (FHdr.SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER32))
    568         rc = RTFileReadAt(File, offHdr + OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader.SizeOfImage),
     569        rc = RTFileReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader.SizeOfImage),
    569570                          &cbImage, sizeof(cbImage), NULL);
    570571    else if (FHdr.SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER64))
    571         rc = RTFileReadAt(File, offHdr + OFFSETOF(IMAGE_NT_HEADERS64, OptionalHeader.SizeOfImage),
     572        rc = RTFileReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS64, OptionalHeader.SizeOfImage),
    572573                          &cbImage, sizeof(cbImage), NULL);
    573574    else
    … …  
    585586     * Allocate the module and read/construct the section headers.
    586587     */
    587     PRTDBGMODPE pModPe = (PRTDBGMODPE)RTMemAlloc(OFFSETOF(RTDBGMODPE, aSections[FHdr.NumberOfSections + 2]));
     588    PRTDBGMODPE pModPe = (PRTDBGMODPE)RTMemAlloc(KDBG_OFFSETOF(RTDBGMODPE, aSections[FHdr.NumberOfSections + 2]));
    588589    AssertReturn(pModPe, VERR_NO_MEMORY);
    589590    pModPe->Core.u32Magic   = RTDBGMOD_MAGIC;
    … …  
    592593    pModPe->cbImage         = cbImage;
    593594    pModPe->cSections       = 1 + FHdr.NumberOfSections;
    594     rc = RTFileReadAt(File, offHdr + OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader) + FHdr.SizeOfOptionalHeader,
     595    rc = RTFileReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader) + FHdr.SizeOfOptionalHeader,
    595596                      &pModPe->aSections[1], sizeof(pModPe->aSections[0]) * FHdr.NumberOfSections, NULL);
    596597    if (RT_SUCCESS(rc))

  • trunk/kProfile/dbgline.cpp

    r3524 r3526  
    3434
    3535#include "dbg.h"
     36#include "kDbgBase.h"
    3637
    3738
    … …  
    5051{
    5152    AssertMsgReturn(VALID_PTR(pLine), ("%p\n", pLine), NULL);
    52     size_t cb = OFFSETOF(RTDBGLINE, szFile[pLine->cchFile + 1]);
     53    size_t cb = KDBG_OFFSETOF(RTDBGLINE, szFile[pLine->cchFile + 1]);
    5354    return (PRTDBGLINE)RTMemDup(pLine, cb);
    5455}

  • trunk/kProfile/dbgmodule.cpp

    r3524 r3526  
    2929*   Header Files                                                               *
    3030*******************************************************************************/
    31 #include <iprt/file.h>
    32 #include <iprt/string.h>
    33 #include <iprt/err.h>
    34 #include <iprt/assert.h>
    35 #include <iprt/alloc.h>
    36 
     31#ifdef KDBG_USE_IPRT
     32# include <iprt/file.h>
     33# include <iprt/string.h>
     34# include <iprt/err.h>
     35# include <iprt/assert.h>
     36# include <iprt/alloc.h>
     37#else
     38#endif
     39
     40#include "kDbgBase.h"
    3741#include "DBGInternal.h"
    38 #include "internal/ldrMZ.h"
    39 #include "internal/ldrPE.h"
     42#include <kLdrModMZ.h>
     43#include <kLdrModPE.h>
    4044
    4145
    … …  
    7983        /* new header? */
    8084        uint32_t offNewHeader;
    81         rc = RTFileReadAt(File, OFFSETOF(IMAGE_DOS_HEADER, e_lfanew), &offNewHeader, sizeof(offNewHeader), NULL);
     85        rc = RTFileReadAt(File, KDBG_OFFSETOF(IMAGE_DOS_HEADER, e_lfanew), &offNewHeader, sizeof(offNewHeader), NULL);
    8286        if (RT_SUCCESS(rc) && offNewHeader)
    8387        {

  • trunk/kProfile/dbgsymbol.cpp

    r3524 r3526  
    3333#include <iprt/alloc.h>
    3434
     35#include "kDbgBase.h"
    3536#include "dbg.h"
    3637
    … …  
    5051{
    5152    AssertMsgReturn(VALID_PTR(pSymbol), ("%p\n", pSymbol), NULL);
    52     size_t cb = OFFSETOF(RTDBGSYMBOL, szName[pSymbol->cchName + 1]);
     53    size_t cb = KDBG_OFFSETOF(RTDBGSYMBOL, szName[pSymbol->cchName + 1]);
    5354    return (PRTDBGSYMBOL)RTMemDup(pSymbol, cb);
    5455}

  • trunk/kProfile/kDbgBase.h

    r3525 r3526  
    22/** @file
    33 *
    4  * kLdr - The Dynamic Loader, Base Definitions and Typedefs.
     4 * kDbg - The Debug Info Reader, Base Definitions and Typedefs.
    55 *
    66 * Copyright (c) 2006-2007 knut st. osmundsen <bird@anduin.net>
    77 *
    88 *
    9  * This file is part of kLdr.
     9 * This file is part of kDbg.
    1010 *
    11  * kLdr is free software; you can redistribute it and/or modify
     11 * kDbg is free software; you can redistribute it and/or modify
    1212 * it under the terms of the GNU General Public License as published by
    1313 * the Free Software Foundation; either version 2 of the License, or
    1414 * (at your option) any later version.
    1515 *
    16  * kLdr is distributed in the hope that it will be useful,
     16 * kDbg is distributed in the hope that it will be useful,
    1717 * but WITHOUT ANY WARRANTY; without even the implied warranty of
    1818 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    … …  
    2020 *
    2121 * You should have received a copy of the GNU General Public License
    22  * along with kLdr; if not, write to the Free Software
     22 * along with kDbg; if not, write to the Free Software
    2323 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2424 *
    2525 */
    2626
    27 #ifndef ___kLdrBase_h___
    28 #define ___kLdrBase_h___
     27#ifndef ___kDbgBase_h___
     28#define ___kDbgBase_h___
    2929
    3030
    31 /** @defgroup grp_kLdrBase  kLdrBase - Base Definitions And Typedefs
     31/** @defgroup grp_kDbgBase  kDbgBase - Base Definitions And Typedefs
    3232 * @{ */
    3333
    3434/*
    35  * kLdr depend on size_t, [u]intNN_t, [u]intptr_t and some related constants.
    36  * If KLDR_ALREADY_INCLUDED_STD_TYPES is defined, these has already been defined.
     35 * kDbg depend on size_t, [u]intNN_t, [u]intptr_t and some related constants.
     36 * If KDBG_ALREADY_INCLUDED_STD_TYPES or KCOMMON_ALREADY_INCLUDED_STD_TYPES
     37 * is defined, these has already been defined.
    3738 */
    38 #ifndef KLDR_ALREADY_INCLUDED_STD_TYPES
     39#if !defined(KDBG_ALREADY_INCLUDED_STD_TYPES) && !defined(KCOMMON_ALREADY_INCLUDED_STD_TYPES)
     40# define KCOMMON_ALREADY_INCLUDED_STD_TYPES 1
    3941# include <sys/types.h>
    4042# include <stddef.h>
    … …  
    7375#  include <stdint.h>
    7476# endif
    75 #endif /* !KLDR_ALREADY_INCLUDED_STD_TYPES */
     77#endif /* !KDBG_ALREADY_INCLUDED_STD_TYPES && !KCOMMON_ALREADY_INCLUDED_STD_TYPES */
    7678
    7779
    7880/** Get the minimum of two values. */
    79 #define KLDR_MIN(a, b)              ((a) <= (b) ? (a) : (b))
     81#define KDBG_MIN(a, b)              ((a) <= (b) ? (a) : (b))
    8082/** Get the maximum of two values. */
    81 #define KLDR_MAX(a, b)              ((a) >= (b) ? (a) : (b))
     83#define KDBG_MAX(a, b)              ((a) >= (b) ? (a) : (b))
    8284/** Calculate the offset of a structure member. */
    83 #define KLDR_OFFSETOF(strct, memb)  ( (size_t)( &((strct *)0)->memb ) )
     85#define KDBG_OFFSETOF(strct, memb)  ( (size_t)( &((strct *)0)->memb ) )
    8486/** Align a size_t value. */
    85 #define KLDR_ALIGN_Z(val, align)    ( ((val) + ((align) - 1)) & ~(size_t)((align) - 1) )
     87#define KDBG_ALIGN_Z(val, align)    ( ((val) + ((align) - 1)) & ~(size_t)((align) - 1) )
    8688/** Align a void * value. */
    87 #define KLDR_ALIGN_P(pv, align)     ( (void *)( ((uintptr_t)(pv) + ((align) - 1)) & ~(uintptr_t)((align) - 1) ) )
     89#define KDBG_ALIGN_P(pv, align)     ( (void *)( ((uintptr_t)(pv) + ((align) - 1)) & ~(uintptr_t)((align) - 1) ) )
    8890/** Align a size_t value. */
    89 #define KLDR_ALIGN_ADDR(val, align) ( ((val) + ((align) - 1)) & ~(KLDRADDR)((align) - 1) )
     91#define KDBG_ALIGN_ADDR(val, align) ( ((val) + ((align) - 1)) & ~(KLDRADDR)((align) - 1) )
    9092/** Number of elements in an array. */
    91 #define KLDR_ELEMENTS(a)            ( sizeof(a) / sizeof((a)[0]) )
     93#define KDBG_ELEMENTS(a)            ( sizeof(a) / sizeof((a)[0]) )
    9294
    9395
    94 /** @def KLDR_LITTLE_ENDIAN
    95  * The kLdr build is for a little endian target. */
    96 /** @def KLDR_BIG_ENDIAN
    97  * The kLdr build is for a big endian target. */
    98 #if !defined(KLDR_LITTLE_ENDIAN) && !defined(KLDR_BIG_ENDIAN)
    99 # define KLDR_LITTLE_ENDIAN
     96/** @def KDBG_LITTLE_ENDIAN
     97 * The kDbg build is for a little endian target. */
     98/** @def KDBG_BIG_ENDIAN
     99 * The kDbg build is for a big endian target. */
     100#if !defined(KDBG_LITTLE_ENDIAN) && !defined(KDBG_BIG_ENDIAN)
     101# define KDBG_LITTLE_ENDIAN
    100102#endif
    101103#ifdef __DOXYGEN__
    102 # define KLDR_BIG_ENDIAN
     104# define KDBG_BIG_ENDIAN
    103105#endif
    104106
    … …  
    107109 * @{ */
    108110
    109 /** @def KLDR_E2E_U16
     111/** @def KDBG_E2E_U16
    110112 * Convert the endian of an unsigned 16-bit value. */
    111 # define KLDR_E2E_U16(u16)      ( (uint16_t) (((u16) >> 8) | ((u16) << 8)) )
    112 /** @def KLDR_E2E_U32
     113# define KDBG_E2E_U16(u16)      ( (uint16_t) (((u16) >> 8) | ((u16) << 8)) )
     114/** @def KDBG_E2E_U32
    113115 * Convert the endian of an unsigned 32-bit value. */
    114 # define KLDR_E2E_U32(u32)      (   ( ((u32) & UINT32_C(0xff000000)) >> 24 ) \
     116# define KDBG_E2E_U32(u32)      (   ( ((u32) & UINT32_C(0xff000000)) >> 24 ) \
    115117                                  | ( ((u32) & UINT32_C(0x00ff0000)) >>  8 ) \
    116118                                  | ( ((u32) & UINT32_C(0x0000ff00)) <<  8 ) \
    117119                                  | ( ((u32) & UINT32_C(0x000000ff)) << 24 ) \
    118120                                )
    119 /** @def KLDR_E2E_U64
     121/** @def KDBG_E2E_U64
    120122 * Convert the endian of an unsigned 64-bit value. */
    121 # define KLDR_E2E_U64(u64)      (   ( ((u64) & UINT64_C(0xff00000000000000)) >> 56 ) \
     123# define KDBG_E2E_U64(u64)      (   ( ((u64) & UINT64_C(0xff00000000000000)) >> 56 ) \
    122124                                  | ( ((u64) & UINT64_C(0x00ff000000000000)) >> 40 ) \
    123125                                  | ( ((u64) & UINT64_C(0x0000ff0000000000)) >> 24 ) \
    … …  
    129131                                )
    130132
    131 /** @def KLDR_LE2H_U16
     133/** @def KDBG_LE2H_U16
    132134 * Unsigned 16-bit little-endian to host endian. */
    133 /** @def KLDR_LE2H_U32
     135/** @def KDBG_LE2H_U32
    134136 * Unsigned 32-bit little-endian to host endian. */
    135 /** @def KLDR_LE2H_U64
     137/** @def KDBG_LE2H_U64
    136138 * Unsigned 64-bit little-endian to host endian. */
    137 /** @def KLDR_BE2H_U16
     139/** @def KDBG_BE2H_U16
    138140 * Unsigned 16-bit big-endian to host endian. */
    139 /** @def KLDR_BE2H_U32
     141/** @def KDBG_BE2H_U32
    140142 * Unsigned 32-bit big-endian to host endian. */
    141 /** @def KLDR_BE2H_U64
     143/** @def KDBG_BE2H_U64
    142144 * Unsigned 64-bit big-endian to host endian. */
    143 #ifdef KLDR_LITTLE_ENDIAN
    144 # define KLDR_LE2H_U16(u16)  ((uint16_t)(u16))
    145 # define KLDR_LE2H_U32(u32)  ((uint32_t)(u32))
    146 # define KLDR_LE2H_U64(u64)  ((uint32_t)(u32))
    147 # define KLDR_BE2H_U16(u16)  KLDR_E2E_U16(u16)
    148 # define KLDR_BE2H_U32(u32)  KLDR_E2E_U32(u32)
    149 # define KLDR_BE2H_U64(u64)  KLDR_E2E_U64(u64)
    150 #elif defined(KLDR_BIG_ENDIAN)
    151 # define KLDR_LE2H_U16(u16)  KLDR_E2E_U16(u16)
    152 # define KLDR_LE2H_U32(u32)  KLDR_E2E_U32(u32)
    153 # define KLDR_LE2H_U32(u64)  KLDR_E2E_U64(u64)
    154 # define KLDR_BE2H_U16(u16)  ((uint16_t)(u16))
    155 # define KLDR_BE2H_U32(u32)  ((uint32_t)(u32))
    156 # define KLDR_BE2H_U64(u64)  ((uint32_t)(u32))
     145#ifdef KDBG_LITTLE_ENDIAN
     146# define KDBG_LE2H_U16(u16)  ((uint16_t)(u16))
     147# define KDBG_LE2H_U32(u32)  ((uint32_t)(u32))
     148# define KDBG_LE2H_U64(u64)  ((uint32_t)(u32))
     149# define KDBG_BE2H_U16(u16)  KDBG_E2E_U16(u16)
     150# define KDBG_BE2H_U32(u32)  KDBG_E2E_U32(u32)
     151# define KDBG_BE2H_U64(u64)  KDBG_E2E_U64(u64)
     152#elif defined(KDBG_BIG_ENDIAN)
     153# define KDBG_LE2H_U16(u16)  KDBG_E2E_U16(u16)
     154# define KDBG_LE2H_U32(u32)  KDBG_E2E_U32(u32)
     155# define KDBG_LE2H_U32(u64)  KDBG_E2E_U64(u64)
     156# define KDBG_BE2H_U16(u16)  ((uint16_t)(u16))
     157# define KDBG_BE2H_U32(u32)  ((uint32_t)(u32))
     158# define KDBG_BE2H_U64(u64)  ((uint32_t)(u32))
    157159#else
    158 # error "KLDR_BIG_ENDIAN or KLDR_LITTLE_ENDIAN is supposed to be defined."
     160# error "KDBG_BIG_ENDIAN or KDBG_LITTLE_ENDIAN is supposed to be defined."
    159161#endif
    160162

  • trunk/kProfile/kPrf2Read.cpp

    r3524 r3526  
    3434#include <string.h>
    3535#include <stdarg.h>
    36 
    37 /* iprt dependencies */
     36#if 0
     37# ifdef KPRF_OS_WINDOWS
     38#  include <malloc.h>
     39typedef unsigned char uint8_t;
     40typedef signed char int8_t;
     41typedef unsigned short uint16_t;
     42typedef signed short int16_t;
     43typedef unsigned int uint32_t;
     44typedef signed int int32_t;
     45typedef unsigned _int64 uint64_t;
     46typedef signed _int64 int64_t;
     47typedef size_t uintptr_t;
     48# else
     49#  include <stdint.h>
     50# endif
     51#else
     52    /* iprt mode */
    3853#include <iprt/types.h>
    3954#include <iprt/err.h>
    4055#include <iprt/avl.h>
    41 #include "dbg.h"
    4256#if 1
    4357# include <iprt/alloc.h>
    … …  
    4559# define free(pv) RTMemFree(pv)
    4660#endif
     61#endif
     62
     63#include "dbg.h"
    4764
    4865

  • trunk/kProfile/kProfileR3.cpp

    r3524 r3526  
    44*   Header Files                                                               *
    55*******************************************************************************/
    6 #if defined(__WIN32__) || defined(__WIN64__)
     6#if defined(KPRF_OS_WINDOWS)
    77# include <windows.h>
    88# include <psapi.h>
    99# include <malloc.h>
    10 # define IN_RING3
    11 # include <iprt/stdint.h> /* Temporary IPRT convenience */
     10typedef unsigned char uint8_t;
     11typedef signed char int8_t;
     12typedef unsigned short uint16_t;
     13typedef signed short int16_t;
     14typedef unsigned int uint32_t;
     15typedef signed int int32_t;
     16typedef unsigned _int64 uint64_t;
     17typedef signed _int64 int64_t;
     18typedef size_t uintptr_t;
    1219# if _MSC_VER >= 1400
    1320#  include <intrin.h>
    … …  
    1522# endif
    1623
    17 #elif defined(__LINUX__) || defined(__FREEBSD__)
     24#elif defined(KPRF_OS_LINUX) || defined(KPRF_OS_FREEBSD)
    1825# define KPRF_USE_PTHREAD
    1926# include <pthread.h>
    … …  
    2835# endif
    2936
    30 #elif defined(__OS2__)
     37#elif defined(KPRF_OS_OS2)
    3138# define INCL_BASE
    32 # include <os2s.h>
     39# include <os2.h>
    3340# include <stdint.h>
    3441# include <sys/fmutex.h>
    … …  
    4451#define KPRF_NAME(Suffix)               KPrf##Suffix
    4552#define KPRF_TYPE(Prefix,Suffix)        Prefix##KPRF##Suffix
    46 #if defined(__WIN32__) || defined(__WIN64__) || defined(__OS2__)
     53#if defined(KPRF_OS_WINDOWS) || defined(KPRF_OS_OS2)
    4754# define KPRF_DECL_FUNC(type, name)     extern "C"  __declspec(dllexport) type __cdecl KPRF_NAME(name)
    4855#else
    … …  
    5360#  define KPRF_ASSERT(expr) do { if (!(expr)) { __asm__ __volatile__("int3\n\tnop\n\t");} } while (0)
    5461# else
    55 #  define KPRF_ASSERT(expr) do { if (!(expr)) { __asm int 3 \
    56                             } } while (0)
     62#  define KPRF_ASSERT(expr) do { if (!(expr)) { __debugbreak(); } } while (0)
    5763# endif
    5864#else
    … …  
    7076#if defined(KPRF_USE_PTHREAD)
    7177typedef pthread_mutex_t     KPRF_TYPE(,MUTEX);
    72 #elif defined(__WIN32__) || defined(__WIN64__)
     78#elif defined(KPRF_OS_WINDOWS)
    7379typedef CRITICAL_SECTION    KPRF_TYPE(,MUTEX);
    74 #elif defined(__OS2__)
     80#elif defined(KPRF_OS_OS2)
    7581typedef struct _fmutex      KPRF_TYPE(,MUTEX);
    7682#endif
    … …  
    8288/** Read/Write lock type. */
    8389typedef pthread_rwlock_t    KPRF_TYPE(,RWLOCK);
    84 #elif defined(__WIN32__) || defined(__WIN64__) || defined(__OS2__)
     90#elif defined(KPRF_OS_WINDOWS) || defined(KPRF_OS_OS2)
    8591/** Read/Write lock state. */
    8692typedef enum KPRF_TYPE(,RWLOCKSTATE)
    … …  
    108114    /** The current number of waiting writers. */
    109115    uint32_t                cWritersWaiting;
    110 # if defined(__WIN32__) || defined(__WIN64__)
     116# if defined(KPRF_OS_WINDOWS)
    111117    /** The handle of the event object on which the waiting readers block. (manual reset). */
    112118    HANDLE                  hevReaders;
    113119    /** The handle of the event object on which the waiting writers block. (manual reset). */
    114120    HANDLE                  hevWriters;
    115 # elif defined(__OS2__)
     121# elif defined(KPRF_OS_OS2)
    116122    /** The handle of the event semaphore on which the waiting readers block. */
    117123    HEV                     hevReaders;
    … …  
    132138*******************************************************************************/
    133139/** The TLS index / key. */
    134 #if defined(__WIN32__) || defined(__WIN64__)
     140#if defined(KPRF_OS_WINDOWS)
    135141static DWORD                g_dwThreadTLS = TLS_OUT_OF_INDEXES;
    136142
    … …  
    138144static pthread_key_t        g_ThreadKey = (pthread_key_t)-1;
    139145
    140 #elif defined(__OS2__)
     146#elif defined(KPRF_OS_OS2)
    141147static KPRF_TYPE(P,THREAD) *g_ppThread = NULL;
    142148
    … …  
    187193
    188194/* Win32/64 */
    189 #if defined(__WIN32__) || defined(__WIN64__)
     195#if defined(KPRF_OS_WINDOWS)
    190196    pThread = (KPRF_TYPE(P,THREAD))TlsGetValue(g_dwThreadTLS);
    191197
    … …  
    194200    pThread = (KPRF_TYPE(P,THREAD))pthread_getspecific(g_ThreadKey);
    195201
    196 #elif defined(__OS2__)
     202#elif defined(KPRF_OS_OS2)
    197203    pThread = *g_ppThread;
    198204
    … …  
    215221{
    216222/* Win32/64 */
    217 #if defined(__WIN32__) || defined(__WIN64__)
     223#if defined(KPRF_OS_WINDOWS)
    218224    uintptr_t ThreadId = (uintptr_t)GetCurrentThreadId();
    219225
    … …  
    222228    uintptr_t ThreadId = (uintptr_t)pthread_self();
    223229
    224 #elif defined(__OS2__)
     230#elif defined(KPRF_OS_OS2)
    225231    PTIB pTib;
    226232    PPIB pPib;
    … …  
    245251{
    246252/* Win32/64 */
    247 #if defined(__WIN32__) || defined(__WIN64__)
     253#if defined(KPRF_OS_WINDOWS)
    248254    uintptr_t ThreadId = (uintptr_t)GetProcessId(GetCurrentProcess());
    249255
    250 #elif defined(__OS2__)
     256#elif defined(KPRF_OS_OS2)
    251257    PTIB pTib;
    252258    PPIB pPib;
    … …  
    275281{
    276282/* Win32/64 */
    277 #if defined(__WIN32__) || defined(__WIN64__)
     283#if defined(KPRF_OS_WINDOWS)
    278284    BOOL fRc = TlsSetValue(g_dwThreadTLS, pThread);
    279285
    … …  
    282288    int rc = pthread_setspecific(g_ThreadKey, pThread);
    283289
    284 #elif defined(__OS2__)
     290#elif defined(KPRF_OS_OS2)
    285291    *g_ppThread = pThread;
    286292
    … …  
    333339{
    334340#if defined(HAVE_INTRIN)
    335     _InterlockedExchange((int32_t *)pu32, (const int32_t)u32);
     341    _InterlockedExchange((long volatile *)pu32, (const long)u32);
    336342
    337343#elif defined(__GNUC__)
    … …  
    404410{
    405411#if defined(HAVE_INTRIN)
    406     _InterlockedExchangeAdd32((volatile int32_t *)pu32, (const int32_t)u32);
     412    _InterlockedExchangeAdd((volatile long *)pu32, (const long)u32);
    407413
    408414#elif defined(__GNUC__)
    … …  
    482488    return -1;
    483489
    484 #elif defined(__WIN32__) || defined(__WIN64__)
     490#elif defined(KPRF_OS_WINDOWS)
    485491    InitializeCriticalSection(pMutex);
    486492    return 0;
    487493
    488 #elif defined(__OS2__)
     494#elif defined(KPRF_OS_OS2)
    489495    if (!_fmutex_create(pMutex, 0))
    490496        return 0;
    … …  
    503509    pthread_mutex_destroy(pMutex);
    504510
    505 #elif defined(__WIN32__) || defined(__WIN64__)
     511#elif defined(KPRF_OS_WINDOWS)
    506512    DeleteCriticalSection(pMutex);
    507513
    508 #elif defined(__OS2__)
     514#elif defined(KPRF_OS_OS2)
    509515    _fmutex_close(pMutex);
    510516#endif
    … …  
    517523static inline void kPrfMutexAcquire(KPRF_TYPE(P,MUTEX) pMutex)
    518524{
    519 #if defined(__WIN32__) || defined(__WIN64__)
     525#if defined(KPRF_OS_WINDOWS)
    520526    EnterCriticalSection(pMutex);
    521527
    … …  
    523529    pthread_mutex_lock(pMutex);
    524530
    525 #elif defined(__OS2__)
     531#elif defined(KPRF_OS_OS2)
    526532    fmutex_request(pMutex);
    527533#endif
    … …  
    535541static inline void kPrfMutexRelease(KPRF_TYPE(P,MUTEX) pMutex)
    536542{
    537 #if defined(__WIN32__) || defined(__WIN64__)
     543#if defined(KPRF_OS_WINDOWS)
    538544    LeaveCriticalSection(pMutex);
    539545
    … …  
    541547    pthread_mutex_lock(pMutex);
    542548
    543 #elif defined(__OS2__)
     549#elif defined(KPRF_OS_OS2)
    544550    fmutex_request(pMutex);
    545551#endif
    … …  
    568574    return -1;
    569575
    570 #elif defined(__WIN32__) || defined(__WIN64__) || defined(__OS2__)
     576#elif defined(KPRF_OS_WINDOWS) || defined(KPRF_OS_OS2)
    571577    if (kPrfMutexInit(&pRWLock->Mutex))
    572578        return -1;
    … …  
    575581    pRWLock->cWritersWaiting = 0;
    576582    pRWLock->enmState = RWLOCK_STATE_SHARED;
    577 # if defined(__WIN32__) || defined(__WIN64__)
     583# if defined(KPRF_OS_WINDOWS)
    578584    pRWLock->hevReaders = CreateEvent(NULL, TRUE, TRUE, NULL);
    579585    pRWLock->hevWriters = CreateEvent(NULL, FALSE, FALSE, NULL);
    … …  
    584590    CloseHandle(pRWLock->hevWriters);
    585591
    586 # elif defined(__OS2__)
     592# elif defined(KPRF_OS_OS2)
    587593    APIRET rc = DosCreateEventSem(NULL, &pRWLock->hevReaders, 0, TRUE);
    588594    if (!rc)
    … …  
    614620    pthread_rwlock_destroy(pRWLock);
    615621
    616 #elif defined(__WIN32__) || defined(__WIN64__) || defined(__OS2__)
     622#elif defined(KPRF_OS_WINDOWS) || defined(KPRF_OS_OS2)
    617623    if (pRWLock->enmState == RWLOCK_STATE_UNINITIALIZED)
    618624        return;
    … …  
    623629    pRWLock->cReadersWaiting = 0;
    624630    pRWLock->cWritersWaiting = 0;
    625 # if defined(__WIN32__) || defined(__WIN64__)
     631# if defined(KPRF_OS_WINDOWS)
    626632    CloseHandle(pRWLock->hevReaders);
    627633    pRWLock->hevReaders = INVALID_HANDLE_VALUE;
    … …  
    629635    pRWLock->hevWriters = INVALID_HANDLE_VALUE;
    630636
    631 # elif defined(__OS2__)
     637# elif defined(KPRF_OS_OS2)
    632638    DosCloseEventSem(pRWLock->hevReaders);
    633639    pRWLock->hevReaders = NULLHANDLE;
    … …  
    648654    pthread_rwlock_rdlock(pRWLock);
    649655
    650 #elif defined(__WIN32__) || defined(__WIN64__) || defined(__OS2__)
     656#elif defined(KPRF_OS_WINDOWS) || defined(KPRF_OS_OS2)
    651657    if (pRWLock->enmState == RWLOCK_STATE_UNINITIALIZED)
    652658        return;
    … …  
    664670        /* have to wait */
    665671        KPRF_ATOMIC_INC32(&pRWLock->cReadersWaiting);
    666 # if defined(__WIN32__) || defined(__WIN64__)
     672# if defined(KPRF_OS_WINDOWS)
    667673        HANDLE hev = pRWLock->hevReaders;
    668674        ResetEvent(hev);
    669675
    670 # elif defined(__OS2__)
     676# elif defined(KPRF_OS_OS2)
    671677        HEV    hev = pRWLock->hevReaders;
    672678        ULONG cIgnored;
    … …  
    676682        kPrfMutexRelease(&pRWLock->Mutex);
    677683
    678 # if defined(__WIN32__) || defined(__WIN64__)
     684# if defined(KPRF_OS_WINDOWS)
    679685        switch (WaitForSingleObject(hev, INFINITE))
    680686        {
    … …  
    688694        }
    689695
    690 # elif defined(__OS2__)
     696# elif defined(KPRF_OS_OS2)
    691697        switch (DosWaitEventSem(hev, SEM_INDEFINITE_WAIT))
    692698        {
    … …  
    723729    pthread_rwlock_unlock(pRWLock);
    724730
    725 #elif defined(__WIN32__) || defined(__WIN64__) || defined(__OS2__)
     731#elif defined(KPRF_OS_WINDOWS) || defined(KPRF_OS_OS2)
    726732    if (pRWLock->enmState == RWLOCK_STATE_UNINITIALIZED)
    727733        return;
    … …  
    747753     * Wake up one (or more on OS/2) waiting writers.
    748754     */
    749 # if defined(__WIN32__) || defined(__WIN64__)
     755# if defined(KPRF_OS_WINDOWS)
    750756    SetEvent(pRWLock->hevWriters);
    751 # elif defined(__OS2__)
     757# elif defined(KPRF_OS_OS2)
    752758    DosPostEvent(pRWLock->hevwriters);
    753759# endif
    … …  
    767773    pthread_rwlock_wrlock(pRWLock);
    768774
    769 #elif defined(__WIN32__) || defined(__WIN64__) || defined(__OS2__)
     775#elif defined(KPRF_OS_WINDOWS) || defined(KPRF_OS_OS2)
    770776    if (pRWLock->enmState == RWLOCK_STATE_UNINITIALIZED)
    771777        return;
    … …  
    790796    for (;;)
    791797    {
    792 # if defined(__WIN32__) || defined(__WIN64__)
     798# if defined(KPRF_OS_WINDOWS)
    793799        HANDLE hev = pRWLock->hevWriters;
    794 # elif defined(__OS2__)
     800# elif defined(KPRF_OS_OS2)
    795801        HEV    hev = pRWLock->hevWriters;
    796802# endif
    797803        kPrfMutexRelease(&pRWLock->Mutex);
    798 # if defined(__WIN32__) || defined(__WIN64__)
     804# if defined(KPRF_OS_WINDOWS)
    799805        switch (WaitForSingleObject(hev, INFINITE))
    800806        {
    … …  
    809815        }
    810816
    811 # elif defined(__OS2__)
     817# elif defined(KPRF_OS_OS2)
    812818        switch (DosWaitEventSem(hev, SEM_INDEFINITE_WAIT))
    813819        {
    … …  
    853859    pthread_rwlock_unlock(pRWLock);
    854860
    855 #elif defined(__WIN32__) || defined(__WIN64__) || defined(__OS2__)
     861#elif defined(KPRF_OS_WINDOWS) || defined(KPRF_OS_OS2)
    856862    if (pRWLock->enmState == RWLOCK_STATE_UNINITIALIZED)
    857863        return;
    … …  
    878884     * Someone is waiting, wake them up as we change the state.
    879885     */
    880 # if defined(__WIN32__) || defined(__WIN64__)
     886# if defined(KPRF_OS_WINDOWS)
    881887    HANDLE hev = INVALID_HANDLE_VALUE;
    882 # elif defined(__OS2__)
     888# elif defined(KPRF_OS_OS2)
    883889    HEV    hev = NULLHANDLE;
    884890# endif
    … …  
    894900        hev = pRWLock->hevReaders;
    895901    }
    896 # if defined(__WIN32__) || defined(__WIN64__)
     902# if defined(KPRF_OS_WINDOWS)
    897903    SetEvent(hev);
    898 # elif defined(__OS2__)
     904# elif defined(KPRF_OS_OS2)
    899905    DosPostEvent(pRWLock->hevwriters);
    900906# endif
    … …  
    919925                         KPRF_TYPE(P,UPTR) puBasePtr, KPRF_TYPE(P,UPTR) pcbSegmentMinusOne)
    920926{
    921 #if defined(__WIN32__) || defined(__WIN64__)
     927#if defined(KPRF_OS_WINDOWS)
    922928    /*
    923929     * Enumerate the module handles.
    … …  
    10371043    }
    10381044
    1039 #elif defined(__OS2__)
     1045#elif defined(KPRF_OS_OS2)
    10401046    /*
    10411047     * Just ask the loader.
    … …  
    11181124     * Some limit stuff in posix / ansi also comes to mind... */
    11191125
    1120 #elif defined(__OS2__)
     1126#elif defined(KPRF_OS_OS2)
    11211127    PTIB pTib;
    11221128    PPIB pPib;
    … …  
    11481154static char *kPrfGetEnvString(const char *pszVar, char *pszValue, uint32_t cchValue, const char *pszDefault)
    11491155{
    1150 #if defined(__WIN32__) || defined(__WIN64__)
     1156#if defined(KPRF_OS_WINDOWS)
    11511157    if (GetEnvironmentVariable(pszVar, pszValue, cchValue))
    11521158        return pszValue;
    11531159
    1154 #elif defined(__OS2__)
     1160#elif defined(KPRF_OS_OS2)
    11551161    PSZ pszValue;
    11561162    if (    !DosScanEnv((PCSZ)pszVar, &pszValue)
    … …  
    11871193static uint32_t kPrfGetEnvValue(const char *pszVar, uint32_t uDefault)
    11881194{
    1189 #if defined(__WIN32__) || defined(__WIN64__)
     1195#if defined(KPRF_OS_WINDOWS)
    11901196    char szBuf[128];
    11911197    const char *pszValue = szBuf;
    … …  
    11931199        pszValue = NULL;
    11941200
    1195 #elif defined(__OS2__)
     1201#elif defined(KPRF_OS_OS2)
    11961202    PSZ pszValue;
    11971203    if (DosScanEnv((PCSZ)pszVar, &pszValue))
    … …  
    12751281static void *kPrfAllocMem(uint32_t cb)
    12761282{
    1277 #if defined(__WIN32__) || defined(__WIN64__)
     1283#if defined(KPRF_OS_WINDOWS)
    12781284    void *pv = VirtualAlloc(NULL, cb, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
    12791285
    … …  
    12811287    void *pv = mmap(NULL, cb, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
    12821288
    1283 #elif defined(__OS2__)
     1289#elif defined(KPRF_OS_OS2)
    12841290    void *pv;
    12851291# ifdef INCL_DOSEXAPIS
    … …  
    13041310static void kPrfFreeMem(void *pv)
    13051311{
    1306 #if defined(__WIN32__) || defined(__WIN64__)
     1312#if defined(KPRF_OS_WINDOWS)
    13071313    VirtualFree(pv, 0, MEM_RELEASE);
    13081314
    … …  
    13101316    munmap(pv, 0); /** @todo check if 0 is allowed here.. */
    13111317
    1312 #elif defined(__OS2__)
     1318#elif defined(KPRF_OS_OS2)
    13131319# ifdef INCL_DOSEXAPIS
    13141320    DosFreeMemEx(&pv);
    … …  
    13381344static int kPrfWriteFile(const char *pszName, const void *pvData, uint32_t cbData)
    13391345{
    1340 #if defined(__WIN32__) || defined(__WIN64__)
     1346#if defined(KPRF_OS_WINDOWS)
    13411347    int rc = -1;
    13421348    HANDLE hFile = CreateFile(pszName,GENERIC_WRITE, FILE_SHARE_READ, NULL,
    … …  
    13521358    return rc;
    13531359
    1354 #elif defined(__OS2__)
     1360#elif defined(KPRF_OS_OS2)
    13551361    HFILE hFile;
    13561362    ULONG ulAction = 0;
    … …  
    14361442                     * Allocate the TLS entry.
    14371443                     */
    1438 #if defined(__WIN32__) || defined(__WIN64__)
     1444#if defined(KPRF_OS_WINDOWS)
    14391445                    g_dwThreadTLS = TlsAlloc();
    14401446                    if (g_dwThreadTLS != TLS_OUT_OF_INDEXES)
    … …  
    14441450                    if (!rc)
    14451451
    1446 #elif defined(__OS2__)
     1452#elif defined(KPRF_OS_OS2)
    14471453                    int rc = DosAllocThreadLocalMemory(sizeof(void *), (PULONG*)&g_ppThread); /** @todo check if this is a count or a size. */
    14481454                    if (!rc)
    … …  
    14891495        return -1;
    14901496
    1491 #if defined(__WIN32__) || defined(__WIN64__)
     1497#if defined(KPRF_OS_WINDOWS)
    14921498    Sleep(10);
    1493 #elif defined(__OS2__)
     1499#elif defined(KPRF_OS_OS2)
    14941500    DosSleep(10);
    14951501#else
    … …  
    15051511     * Use the stack space to fill in process details.
    15061512     */
    1507 #if defined(__WIN32__) || defined(__WIN64__)
     1513#if defined(KPRF_OS_WINDOWS)
    15081514    /* all is one single string */
    15091515    const char *pszCommandLine = GetCommandLine();
    … …  
    15111517        KPRF_NAME(SetCommandLine)(pHdr, 1, &pszCommandLine);
    15121518
    1513 #elif defined(__OS2__) || defined(__OS2__)
     1519#elif defined(KPRF_OS_OS2) || defined(KPRF_OS_OS2)
    15141520    PTIB pTib;
    15151521    PPIB pPib;
    … …  
    15751581     */
    15761582    kPrfFreeMem(pHdr);
    1577 #if defined(__WIN32__) || defined(__WIN64__)
     1583#if defined(KPRF_OS_WINDOWS)
    15781584    TlsFree(g_dwThreadTLS);
    15791585    g_dwThreadTLS = TLS_OUT_OF_INDEXES;
    … …  
    15831589    g_ThreadKey = (pthread_key_t)-1;
    15841590
    1585 #elif defined(__OS2__)
     1591#elif defined(KPRF_OS_OS2)
    15861592    DosFreeThreadLocalMemory((PULONG)g_ppThread);
    15871593    g_ppThread = NULL;

  • trunk/kProfile/prfamd64msc.asm

    r3524 r3526  
    22;; @file
    33;
    4 ; kProfiler MK2 - Microsoft C/C++ Compiler Interaction.
     4; kProfiler MK2 - Microsoft C/C++ Compiler Interaction, AMD64.
    55;
    66;
    … …  
    3838extern KPRF_LEAVE
    3939
    40 global __penter
    41 global __pexit
     40global _penter
     41global _pexit
    4242
    4343;ifdef  UNDEFINED
    … …  
    4646global common_no_overhead
    4747global calibrate
    48 global outer_calibration_loop
    49 global inner_calibration_loop
    5048global calib_inner_update_minimum
    5149global calib_inner_next
    … …  
    7573;
    7674align 16
    77 __penter:
     75_penter:
    7876        ; save volatile register and get the time stamp.
    7977        push    eax
    … …  
    116114;
    117115align 16
    118 __pexit:
     116_pexit:
    119117        ; save volatile register and get the time stamp.
    120118        push    eax
    … …  
    280278
    281279;;
    282 ; The calibration __penter - this must be identical to the real thing except for the KPRF call.
     280; The calibration _penter - this must be identical to the real thing except for the KPRF call.
    283281align 16
    284282calib_penter:
    … …  
    305303
    306304;;
    307 ; The calibration __pexit - this must be identical to the real thing except for the KPRF call.
     305; The calibration _pexit - this must be identical to the real thing except for the KPRF call.
    308306align 16
    309307calib_pexit:

  • trunk/kProfile/prfx86msc.asm

    r3524 r3526  
    4646global common_no_overhead
    4747global calibrate
    48 global outer_calibration_loop
    49 global inner_calibration_loop
    5048global calib_inner_update_minimum
    5149global calib_inner_next
Note: See TracChangeset for help on using the changeset viewer.