yuzu/breakpad
1
0
Fork 0
mirror of https://github.com/yuzu-emu/breakpad.git synced 2025-01-23 21:01:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit issue 140001: fixes for 64-bit build cleanups.

Browse source 
a=dmaclach, r=jimb


git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@664 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
jimblandy 2010-08-25 00:41:25 +00:00
parent f8bca185b9
commit a453cc24f4
3 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/dwarf/bytereader.cc
View file

@ -123,11 +123,11 @@ uint64 ByteReader::ReadEncodedPointer(const char *buffer,
// First, find the offset to START from the closest prior aligned // First, find the offset to START from the closest prior aligned
// address. // address.
size_t skew = section_base_ & (AddressSize() - 1); uint64_t skew = section_base_ & (AddressSize() - 1);
// Now find the offset from that aligned address to buffer. // Now find the offset from that aligned address to buffer.
off_t offset = skew + (buffer - buffer_base_); uint64_t offset = skew + (buffer - buffer_base_);
// Round up to the next boundary. // Round up to the next boundary.
size_t aligned = (offset + AddressSize() - 1) & -AddressSize(); uint64_t aligned = (offset + AddressSize() - 1) & -AddressSize();
// Convert back to a pointer. // Convert back to a pointer.
const char *aligned_buffer = buffer_base_ + (aligned - skew); const char *aligned_buffer = buffer_base_ + (aligned - skew);
// Finally, store the length and actually fetch the pointer. // Finally, store the length and actually fetch the pointer.

2
src/common/dwarf/bytereader.h
View file

@ -301,7 +301,7 @@ class ByteReader {
// Base addresses for Linux C++ exception handling data's encoded pointers. // Base addresses for Linux C++ exception handling data's encoded pointers.
bool have_section_base_, have_text_base_, have_data_base_; bool have_section_base_, have_text_base_, have_data_base_;
bool have_function_base_; bool have_function_base_;
size_t section_base_, text_base_, data_base_, function_base_; uint64_t section_base_, text_base_, data_base_, function_base_;
const char *buffer_base_; const char *buffer_base_;
}; };

8
src/tools/mac/crash_report/crash_report.mm
View file

@ -88,12 +88,12 @@ static int PrintRegister(const char *name, u_int32_t value, int sequence) {
//============================================================================= //=============================================================================
static void PrintStack(const CallStack *stack, const string &cpu) { static void PrintStack(const CallStack *stack, const string &cpu) {
int frame_count = stack->frames()->size(); size_t frame_count = stack->frames()->size();
char buffer[1024]; char buffer[1024];
for (int frame_index = 0; frame_index < frame_count; ++frame_index) { for (size_t frame_index = 0; frame_index < frame_count; ++frame_index) {
const StackFrame *frame = stack->frames()->at(frame_index); const StackFrame *frame = stack->frames()->at(frame_index);
const CodeModule *module = frame->module; const CodeModule *module = frame->module;
printf("%2d ", frame_index); printf("%2zu ", frame_index);
if (module) { if (module) {
// Module name (20 chars max) // Module name (20 chars max)
@ -279,7 +279,7 @@ static void ProcessSingleReport(Options *options, NSString *file_path) {
} }
// Print all of the threads in the dump. // Print all of the threads in the dump.
int thread_count = process_state.threads()->size(); int thread_count = static_cast<int>(process_state.threads()->size());
const std::vector<google_breakpad::MinidumpMemoryRegion*> const std::vector<google_breakpad::MinidumpMemoryRegion*>
*thread_memory_regions = process_state.thread_memory_regions(); *thread_memory_regions = process_state.thread_memory_regions();