- Timestamp:
- Apr 4, 2017 1:17:22 PM (8 years ago)
- Location:
- trunk/src/VBox
- Files:
-
- 1 added
- 12 edited
-
Additions/common/VBoxGuest/freebsd/Makefile (modified) (1 diff)
-
Additions/common/VBoxGuest/freebsd/files_vboxguest (modified) (1 diff)
-
Additions/common/VBoxGuest/linux/Makefile (modified) (3 diffs)
-
Additions/common/VBoxGuest/linux/files_vboxguest (modified) (1 diff)
-
HostDrivers/Support/Makefile.kmk (modified) (1 diff)
-
HostDrivers/Support/freebsd/Makefile (modified) (1 diff)
-
HostDrivers/Support/freebsd/files_vboxdrv (modified) (1 diff)
-
HostDrivers/Support/linux/Makefile (modified) (1 diff)
-
HostDrivers/Support/linux/files_vboxdrv (modified) (1 diff)
-
Runtime/Makefile.kmk (modified) (3 diffs)
-
Runtime/common/string/strformatrt.cpp (modified) (2 diffs)
-
Runtime/generic/rtStrFormatKernelAddress-generic.cpp (added)
-
Runtime/include/internal/string.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/common/VBoxGuest/freebsd/Makefile
r54609 r66415 123 123 RTSemEventMultiWaitNoResume-2-ex-generic.c \ 124 124 RTTimerCreate-generic.c \ 125 rtStrFormatKernelAddress-generic.c \ 125 126 timer-generic.c \ 126 127 errvars-generic.c \ -
trunk/src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest
r57943 r66415 159 159 ${PATH_ROOT}/src/VBox/Runtime/generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp=>generic/RTSemEventMultiWaitNoResume-2-ex-generic.c \ 160 160 ${PATH_ROOT}/src/VBox/Runtime/generic/RTTimerCreate-generic.cpp=>generic/RTTimerCreate-generic.c \ 161 ${PATH_ROOT}/src/VBox/Runtime/generic/rtStrFormatKernelAddress-generic.cpp=>generic/rtStrFormatKernelAddress-generic.c \ 161 162 ${PATH_ROOT}/src/VBox/Runtime/generic/errvars-generic.cpp=>generic/errvars-generic.c \ 162 163 ${PATH_ROOT}/src/VBox/Runtime/generic/timer-generic.cpp=>generic/timer-generic.c \ -
trunk/src/VBox/Additions/common/VBoxGuest/linux/Makefile
r61081 r66415 59 59 common/err/RTErrConvertToErrno.o \ 60 60 common/log/log.o \ 61 common/log/logellipsis.o \62 common/log/logrel.o \63 common/log/logrelellipsis.o \64 common/log/logcom.o \61 common/log/logellipsis.o \ 62 common/log/logrel.o \ 63 common/log/logrelellipsis.o \ 64 common/log/logcom.o \ 65 65 common/log/logformat.o \ 66 66 common/misc/RTAssertMsg1Weak.o \ … … 84 84 common/time/time.o \ 85 85 generic/RTAssertShouldPanic-generic.o \ 86 generic/RTLogWriteStdErr-stub-generic.o \87 generic/RTLogWriteStdOut-stub-generic.o \86 generic/RTLogWriteStdErr-stub-generic.o \ 87 generic/RTLogWriteStdOut-stub-generic.o \ 88 88 generic/RTMpGetCoreCount-generic.o \ 89 89 generic/RTSemEventWait-2-ex-generic.o \ … … 91 91 generic/RTSemEventMultiWait-2-ex-generic.o \ 92 92 generic/RTSemEventMultiWaitNoResume-2-ex-generic.o \ 93 generic/rtStrFormatKernelAddress-generic.o \ 93 94 generic/errvars-generic.o \ 94 95 generic/mppresent-generic.o \ -
trunk/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest
r58347 r66415 148 148 ${PATH_ROOT}/src/VBox/Runtime/generic/RTSemEventMultiWait-2-ex-generic.cpp=>generic/RTSemEventMultiWait-2-ex-generic.c \ 149 149 ${PATH_ROOT}/src/VBox/Runtime/generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp=>generic/RTSemEventMultiWaitNoResume-2-ex-generic.c \ 150 ${PATH_ROOT}/src/VBox/Runtime/generic/rtStrFormatKernelAddress-generic.cpp=>generic/rtStrFormatKernelAddress-generic.c \ 150 151 ${PATH_ROOT}/src/VBox/Runtime/generic/errvars-generic.cpp=>generic/errvars-generic.c \ 151 152 ${PATH_ROOT}/src/VBox/Runtime/generic/mppresent-generic.cpp=>generic/mppresent-generic.c \ -
trunk/src/VBox/HostDrivers/Support/Makefile.kmk
r66072 r66415 362 362 $(VBOX_PATH_RUNTIME_SRC)/generic/RTPathGetCurrentDrive-generic.cpp \ 363 363 $(VBOX_PATH_RUNTIME_SRC)/generic/RTPathGetCurrentOnDrive-generic.cpp \ 364 $(VBOX_PATH_RUNTIME_SRC)/generic/rtStrFormatKernelAddress-generic.cpp \ 364 365 $(VBOX_PATH_RUNTIME_SRC)/generic/memsafer-generic.cpp \ 365 366 $(VBOX_PATH_RUNTIME_SRC)/generic/uuid-generic.cpp \ -
trunk/src/VBox/HostDrivers/Support/freebsd/Makefile
r60603 r66415 142 142 RTSemEventMultiWaitNoResume-2-ex-generic.c \ 143 143 RTTimerCreate-generic.c \ 144 rtStrFormatKernelAddress-generic.c \ 144 145 errvars-generic.c \ 145 146 mppresent-generic.c \ -
trunk/src/VBox/HostDrivers/Support/freebsd/files_vboxdrv
r60603 r66415 160 160 ${PATH_ROOT}/src/VBox/Runtime/include/internal/process.h=>include/internal/process.h \ 161 161 ${PATH_ROOT}/src/VBox/Runtime/include/internal/time.h=>include/internal/time.h \ 162 ${PATH_ROOT}/src/VBox/Runtime/generic/rtStrFormatKernelAddress-generic.cpp=>generic/rtStrFormatKernelAddress-generic.c \ 162 163 ${PATH_ROOT}/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp=>generic/RTAssertShouldPanic-generic.c \ 163 164 ${PATH_ROOT}/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp=>generic/RTLogWriteStdErr-stub-generic.c \ -
trunk/src/VBox/HostDrivers/Support/linux/Makefile
r61411 r66415 149 149 generic/RTSemEventMultiWaitNoResume-2-ex-generic.o \ 150 150 generic/RTTimerCreate-generic.o \ 151 generic/rtStrFormatKernelAddress-generic.o \ 151 152 generic/errvars-generic.o \ 152 153 generic/mppresent-generic.o \ -
trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv
r66022 r66415 153 153 ${PATH_ROOT}/src/VBox/Runtime/include/internal/thread.h=>include/internal/thread.h \ 154 154 ${PATH_ROOT}/src/VBox/Runtime/include/internal/time.h=>include/internal/time.h \ 155 ${PATH_ROOT}/src/VBox/Runtime/generic/rtStrFormatKernelAddress-generic.cpp=>generic/rtStrFormatKernelAddress-generic.c \ 155 156 ${PATH_ROOT}/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp=>generic/RTAssertShouldPanic-generic.c \ 156 157 ${PATH_ROOT}/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp=>generic/RTLogWriteStdErr-stub-generic.c \ -
trunk/src/VBox/Runtime/Makefile.kmk
r66395 r66415 638 638 generic/RTPathIsSame-generic.cpp \ 639 639 generic/RTTimerLRCreate-generic.cpp \ 640 generic/rtStrFormatKernelAddress-generic.cpp \ 640 641 generic/mempool-generic.cpp \ 641 642 generic/semfastmutex-generic.cpp \ … … 2108 2109 generic/RTSemEventMultiWait-2-ex-generic.cpp \ 2109 2110 generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp \ 2111 generic/rtStrFormatKernelAddress-generic.cpp \ 2110 2112 generic/critsect-generic.cpp \ 2111 2113 generic/errvars-generic.cpp \ … … 2628 2630 gc/initterm-gc.cpp \ 2629 2631 generic/RTAssertShouldPanic-generic.cpp \ 2632 generic/rtStrFormatKernelAddress-generic.cpp \ 2630 2633 generic/errvars-generic.cpp \ 2631 2634 \ -
trunk/src/VBox/Runtime/common/string/strformatrt.cpp
r66304 r66415 365 365 int32_t i32; 366 366 int64_t i64; 367 RTR0INTPTR uR0Ptr; 367 368 RTFAR16 fp16; 368 369 RTFAR32 fp32; … … 478 479 if (fFlags & RTSTR_F_OBFUSCATE_PTR) 479 480 { 480 # if R0_ARCH_BITS == 64 481 static const char s_szObfuscated[] = "0xXXXXXXXXXXXXXXXX"; 482 # else 483 static const char s_szObfuscated[] = "0xXXXXXXXX"; 484 # endif 485 if (fFlags & RTSTR_F_SPECIAL) 486 return pfnOutput(pvArgOutput, s_szObfuscated, sizeof(s_szObfuscated) - 1); 487 return pfnOutput(pvArgOutput, &s_szObfuscated[2], sizeof(s_szObfuscated) - 1 - 2); 481 cch = rtStrFormatKernelAddress(szBuf, sizeof(szBuf), u.uR0Ptr, cchWidth, cchPrecision, fFlags); 482 return pfnOutput(pvArgOutput, szBuf, cch); 488 483 } 489 484 #endif -
trunk/src/VBox/Runtime/include/internal/string.h
r62477 r66415 53 53 int cchWidth, int cchPrecision, unsigned fFlags, char chArgSize); 54 54 55 /** 56 * Format kernel address into @a pszBuf. 57 * 58 * @returns Number of bytes returned. 59 * @param pszBuf The return buffer. 60 * @param cbBuf The buffer size. 61 * @param uPtr The ring-0 pointer value. 62 * @param cchWidth The specified width, -1 if not given. 63 * @param cchPrecision The specified precision. 64 * @param fFlags Format flags, RTSTR_F_XXX. 65 */ 66 DECLHIDDEN(size_t) rtStrFormatKernelAddress(char *pszBuf, size_t cbBuf, RTR0INTPTR uPtr, signed int cchWidth, 67 signed int cchPrecision, unsigned int fFlags); 68 55 69 #ifdef RT_WITH_ICONV_CACHE 56 70 DECLHIDDEN(void) rtStrIconvCacheInit(struct RTTHREADINT *pThread);
Note:
See TracChangeset
for help on using the changeset viewer.

