Index: src/processor/stackwalker_amd64_unittest.cc |
=================================================================== |
--- a/src/processor/stackwalker_amd64_unittest.cc |
+++ b/src/processor/stackwalker_amd64_unittest.cc |
@@ -104,19 +104,19 @@ class StackwalkerAMD64Fixture { |
void RegionFromSection() { |
string contents; |
ASSERT_TRUE(stack_section.GetContents(&contents)); |
stack_region.Init(stack_section.start().Value(), contents); |
} |
// Fill RAW_CONTEXT with pseudo-random data, for round-trip checking. |
void BrandContext(MDRawContextAMD64 *raw_context) { |
- u_int8_t x = 173; |
+ uint8_t x = 173; |
for (size_t i = 0; i < sizeof(*raw_context); i++) |
- reinterpret_cast<u_int8_t *>(raw_context)[i] = (x += 17); |
+ reinterpret_cast<uint8_t *>(raw_context)[i] = (x += 17); |
} |
SystemInfo system_info; |
MDRawContextAMD64 raw_context; |
Section stack_section; |
MockMemoryRegion stack_region; |
MockCodeModule module1; |
MockCodeModule module2; |
@@ -194,18 +194,18 @@ class GetCallerFrame: public Stackwalker |
TEST_F(GetCallerFrame, ScanWithoutSymbols) { |
// When the stack walker resorts to scanning the stack, |
// only addresses located within loaded modules are |
// considered valid return addresses. |
// Force scanning through three frames to ensure that the |
// stack pointer is set properly in scan-recovered frames. |
stack_section.start() = 0x8000000080000000ULL; |
- u_int64_t return_address1 = 0x50000000b0000100ULL; |
- u_int64_t return_address2 = 0x50000000b0000900ULL; |
+ uint64_t return_address1 = 0x50000000b0000100ULL; |
+ uint64_t return_address2 = 0x50000000b0000900ULL; |
Label frame1_sp, frame2_sp, frame1_rbp; |
stack_section |
// frame 0 |
.Append(16, 0) // space |
.D64(0x40000000b0000000ULL) // junk that's not |
.D64(0x50000000d0000000ULL) // a return address |
@@ -265,17 +265,17 @@ TEST_F(GetCallerFrame, ScanWithoutSymbol |
} |
TEST_F(GetCallerFrame, ScanWithFunctionSymbols) { |
// During stack scanning, if a potential return address |
// is located within a loaded module that has symbols, |
// it is only considered a valid return address if it |
// lies within a function's bounds. |
stack_section.start() = 0x8000000080000000ULL; |
- u_int64_t return_address = 0x50000000b0000110ULL; |
+ uint64_t return_address = 0x50000000b0000110ULL; |
Label frame1_sp, frame1_rbp; |
stack_section |
// frame 0 |
.Append(16, 0) // space |
.D64(0x40000000b0000000ULL) // junk that's not |
.D64(0x50000000b0000000ULL) // a return address |
@@ -328,17 +328,17 @@ TEST_F(GetCallerFrame, ScanWithFunctionS |
} |
TEST_F(GetCallerFrame, CallerPushedRBP) { |
// Functions typically push their %rbp upon entry and set %rbp pointing |
// there. If stackwalking finds a plausible address for the next frame's |
// %rbp directly below the return address, assume that it is indeed the |
// next frame's %rbp. |
stack_section.start() = 0x8000000080000000ULL; |
- u_int64_t return_address = 0x50000000b0000110ULL; |
+ uint64_t return_address = 0x50000000b0000110ULL; |
Label frame0_rbp, frame1_sp, frame1_rbp; |
stack_section |
// frame 0 |
.Append(16, 0) // space |
.D64(0x40000000b0000000ULL) // junk that's not |
.D64(0x50000000b0000000ULL) // a return address |