fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Starting to remove some macros.

Browse Source
This commit is contained in:
Ben Vanik
2014-08-16 16:57:00 -07:00
parent ead74f2cdb
commit 54ce9db743
21 changed files with 74 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/alloy/frontend/ppc/ppc_scanner.cc
View File

@@ -9,6 +9,7 @@
#include <alloy/frontend/ppc/ppc_scanner.h>
#include <algorithm>
#include <map>
#include <alloy/frontend/ppc/ppc_frontend.h>
@@ -49,10 +50,10 @@ int PPCScanner::FindExtents(FunctionInfo* symbol_info) {
XELOGSDB("Analyzing function %.8X...", symbol_info->address());
uint64_t start_address = symbol_info->address();
uint64_t end_address = symbol_info->end_address();
uint64_t address = start_address;
uint64_t furthest_target = start_address;
uint32_t start_address = symbol_info->address();
uint32_t end_address = symbol_info->end_address();
uint32_t address = start_address;
uint32_t furthest_target = start_address;
size_t blocks_found = 0;
bool in_block = false;
bool starts_with_mfspr_lr = false;
@@ -191,7 +192,7 @@ int PPCScanner::FindExtents(FunctionInfo* symbol_info) {
*/
if (!ends_fn && !IsRestGprLr(target)) {
furthest_target = MAX(furthest_target, target);
furthest_target = std::max(furthest_target, target);
// TODO(benvanik): perhaps queue up for a speculative check? I think
// we are running over tail-call functions here that branch to
@@ -217,7 +218,7 @@ int PPCScanner::FindExtents(FunctionInfo* symbol_info) {
// TODO(benvanik): GetOrInsertFunction? it's likely a BB
if (!IsRestGprLr(target)) {
furthest_target = MAX(furthest_target, target);
furthest_target = std::max(furthest_target, target);
}
}
ends_block = true;

2
src/alloy/string_buffer.cc
View File

@@ -14,7 +14,7 @@
namespace alloy {
StringBuffer::StringBuffer(size_t initial_capacity) {
buffer_.reserve(MAX(initial_capacity, 1024));
buffer_.reserve(std::max(initial_capacity, 1024ull));
}
StringBuffer::~StringBuffer() = default;