From 8f5bae81215b0281016bac2b4e5877838274053d Mon Sep 17 00:00:00 2001 From: Anthony Pesch Date: Sat, 31 Oct 2015 07:14:32 -0700 Subject: [PATCH] updated clang versions, reformatted --- cmake/FindClangFormat.cmake | 2 +- src/hw/holly/tile_renderer.cc | 14 +++--- src/hw/maple/maple_controller.cc | 19 +++----- .../interpreter/interpreter_backend.cc | 13 +++--- src/jit/backend/x64/x64_backend.cc | 19 +++----- src/jit/backend/x64/x64_emitter.cc | 45 ++++++++++++++----- src/renderer/gl_backend.cc | 15 +++++-- 7 files changed, 72 insertions(+), 55 deletions(-) diff --git a/cmake/FindClangFormat.cmake b/cmake/FindClangFormat.cmake index 313e89f9..62cf30af 100644 --- a/cmake/FindClangFormat.cmake +++ b/cmake/FindClangFormat.cmake @@ -1,4 +1,4 @@ -find_program(CLANG_FORMAT_EXECUTABLE NAMES clang-format clang-format-3.6) +find_program(CLANG_FORMAT_EXECUTABLE NAMES clang-format clang-format-3.6 clang-format-3.7) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(cppcheck DEFAULT_MSG diff --git a/src/hw/holly/tile_renderer.cc b/src/hw/holly/tile_renderer.cc index 56411f93..2f12e79d 100644 --- a/src/hw/holly/tile_renderer.cc +++ b/src/hw/holly/tile_renderer.cc @@ -65,17 +65,19 @@ inline CullFace TranslateCull(uint32_t cull_mode) { inline BlendFunc TranslateSrcBlendFunc(uint32_t blend_func) { static BlendFunc src_blend_funcs[] = { - BLEND_ZERO, BLEND_ONE, BLEND_SRC_COLOR, BLEND_ONE_MINUS_SRC_COLOR, - BLEND_SRC_ALPHA, BLEND_ONE_MINUS_SRC_ALPHA, BLEND_DST_ALPHA, - BLEND_ONE_MINUS_DST_ALPHA}; + BLEND_ZERO, BLEND_ONE, + BLEND_SRC_COLOR, BLEND_ONE_MINUS_SRC_COLOR, + BLEND_SRC_ALPHA, BLEND_ONE_MINUS_SRC_ALPHA, + BLEND_DST_ALPHA, BLEND_ONE_MINUS_DST_ALPHA}; return src_blend_funcs[blend_func]; } inline BlendFunc TranslateDstBlendFunc(uint32_t blend_func) { static BlendFunc dst_blend_funcs[] = { - BLEND_ZERO, BLEND_ONE, BLEND_DST_COLOR, BLEND_ONE_MINUS_DST_COLOR, - BLEND_SRC_ALPHA, BLEND_ONE_MINUS_SRC_ALPHA, BLEND_DST_ALPHA, - BLEND_ONE_MINUS_DST_ALPHA}; + BLEND_ZERO, BLEND_ONE, + BLEND_DST_COLOR, BLEND_ONE_MINUS_DST_COLOR, + BLEND_SRC_ALPHA, BLEND_ONE_MINUS_SRC_ALPHA, + BLEND_DST_ALPHA, BLEND_ONE_MINUS_DST_ALPHA}; return dst_blend_funcs[blend_func]; } diff --git a/src/hw/maple/maple_controller.cc b/src/hw/maple/maple_controller.cc index ce229ca2..e10d814c 100644 --- a/src/hw/maple/maple_controller.cc +++ b/src/hw/maple/maple_controller.cc @@ -12,19 +12,12 @@ DEFINE_string(profile, "", "Controller profile"); // Controller profile contains button mappings and other misc. configurable // settings for the controller. -static Json default_profile = Json::object{{"joyx", ""}, - {"joyy", ""}, - {"ltrig", ""}, - {"rtrig", ""}, - {"start", "space"}, - {"a", "k"}, - {"b", "l"}, - {"x", "j"}, - {"y", "i"}, - {"dpad_up", "w"}, - {"dpad_down", "s"}, - {"dpad_left", "a"}, - {"dpad_right", "d"}}; +static Json default_profile = + Json::object{{"joyx", ""}, {"joyy", ""}, {"ltrig", ""}, + {"rtrig", ""}, {"start", "space"}, {"a", "k"}, + {"b", "l"}, {"x", "j"}, {"y", "i"}, + {"dpad_up", "w"}, {"dpad_down", "s"}, {"dpad_left", "a"}, + {"dpad_right", "d"}}; MapleControllerProfile::MapleControllerProfile() : button_map_() {} diff --git a/src/jit/backend/interpreter/interpreter_backend.cc b/src/jit/backend/interpreter/interpreter_backend.cc index 804f260a..ec02059e 100644 --- a/src/jit/backend/interpreter/interpreter_backend.cc +++ b/src/jit/backend/interpreter/interpreter_backend.cc @@ -14,14 +14,11 @@ namespace dreavm { namespace jit { namespace backend { namespace interpreter { -const Register int_registers[] = {{"a", ir::VALUE_INT_MASK}, - {"b", ir::VALUE_INT_MASK}, - {"c", ir::VALUE_INT_MASK}, - {"d", ir::VALUE_INT_MASK}, - {"e", ir::VALUE_FLOAT_MASK}, - {"f", ir::VALUE_FLOAT_MASK}, - {"g", ir::VALUE_FLOAT_MASK}, - {"h", ir::VALUE_FLOAT_MASK}}; +const Register int_registers[] = { + {"a", ir::VALUE_INT_MASK}, {"b", ir::VALUE_INT_MASK}, + {"c", ir::VALUE_INT_MASK}, {"d", ir::VALUE_INT_MASK}, + {"e", ir::VALUE_FLOAT_MASK}, {"f", ir::VALUE_FLOAT_MASK}, + {"g", ir::VALUE_FLOAT_MASK}, {"h", ir::VALUE_FLOAT_MASK}}; const int int_num_registers = sizeof(int_registers) / sizeof(Register); } diff --git a/src/jit/backend/x64/x64_backend.cc b/src/jit/backend/x64/x64_backend.cc index b0cbd3eb..12977ad1 100644 --- a/src/jit/backend/x64/x64_backend.cc +++ b/src/jit/backend/x64/x64_backend.cc @@ -19,18 +19,13 @@ namespace dreavm { namespace jit { namespace backend { namespace x64 { -const Register x64_registers[] = {{"rbx", ir::VALUE_INT_MASK}, - {"rbp", ir::VALUE_INT_MASK}, - {"r12", ir::VALUE_INT_MASK}, - {"r13", ir::VALUE_INT_MASK}, - {"r14", ir::VALUE_INT_MASK}, - {"r15", ir::VALUE_INT_MASK}, - {"xmm6", ir::VALUE_FLOAT_MASK}, - {"xmm7", ir::VALUE_FLOAT_MASK}, - {"xmm8", ir::VALUE_FLOAT_MASK}, - {"xmm9", ir::VALUE_FLOAT_MASK}, - {"xmm10", ir::VALUE_FLOAT_MASK}, - {"xmm11", ir::VALUE_FLOAT_MASK}}; +const Register x64_registers[] = { + {"rbx", ir::VALUE_INT_MASK}, {"rbp", ir::VALUE_INT_MASK}, + {"r12", ir::VALUE_INT_MASK}, {"r13", ir::VALUE_INT_MASK}, + {"r14", ir::VALUE_INT_MASK}, {"r15", ir::VALUE_INT_MASK}, + {"xmm6", ir::VALUE_FLOAT_MASK}, {"xmm7", ir::VALUE_FLOAT_MASK}, + {"xmm8", ir::VALUE_FLOAT_MASK}, {"xmm9", ir::VALUE_FLOAT_MASK}, + {"xmm10", ir::VALUE_FLOAT_MASK}, {"xmm11", ir::VALUE_FLOAT_MASK}}; const int x64_num_registers = sizeof(x64_registers) / sizeof(Register); } diff --git a/src/jit/backend/x64/x64_emitter.cc b/src/jit/backend/x64/x64_emitter.cc index ecf448f9..99faaf11 100644 --- a/src/jit/backend/x64/x64_emitter.cc +++ b/src/jit/backend/x64/x64_emitter.cc @@ -44,14 +44,34 @@ using namespace dreavm::jit::ir; // map register ids coming from IR values, must be in sync with x64_backend.h // note, only callee saved registers are used here to avoid having to reload // registers when calling non-JIT'd functions -static const Xbyak::Reg *reg_map_8[] = { - &Xbyak::util::bl, &Xbyak::util::bpl, &Xbyak::util::r12b, &Xbyak::util::r13b, - &Xbyak::util::r14b, &Xbyak::util::r15b, nullptr, nullptr, nullptr, nullptr, - nullptr, nullptr, nullptr, nullptr}; -static const Xbyak::Reg *reg_map_16[] = { - &Xbyak::util::bx, &Xbyak::util::bp, &Xbyak::util::r12w, &Xbyak::util::r13w, - &Xbyak::util::r14w, &Xbyak::util::r15w, nullptr, nullptr, nullptr, nullptr, - nullptr, nullptr, nullptr, nullptr}; +static const Xbyak::Reg *reg_map_8[] = {&Xbyak::util::bl, + &Xbyak::util::bpl, + &Xbyak::util::r12b, + &Xbyak::util::r13b, + &Xbyak::util::r14b, + &Xbyak::util::r15b, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr}; +static const Xbyak::Reg *reg_map_16[] = {&Xbyak::util::bx, + &Xbyak::util::bp, + &Xbyak::util::r12w, + &Xbyak::util::r13w, + &Xbyak::util::r14w, + &Xbyak::util::r15w, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr}; static const Xbyak::Reg *reg_map_32[] = { &Xbyak::util::ebx, &Xbyak::util::ebp, &Xbyak::util::r12d, &Xbyak::util::r13d, &Xbyak::util::r14d, &Xbyak::util::r15d, @@ -66,9 +86,12 @@ static const Xbyak::Reg *reg_map_64[] = { // map register ids coming from IR values for callee saved registers. use // nullptr to specify that the register isn't saved static const Xbyak::Reg *callee_save_map[] = { - &Xbyak::util::rbx, &Xbyak::util::rbp, &Xbyak::util::r12, &Xbyak::util::r13, - &Xbyak::util::r14, &Xbyak::util::r15, nullptr, nullptr, - nullptr, nullptr, nullptr, nullptr, + &Xbyak::util::rbx, &Xbyak::util::rbp, + &Xbyak::util::r12, &Xbyak::util::r13, + &Xbyak::util::r14, &Xbyak::util::r15, + nullptr, nullptr, + nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr}; #ifdef PLATFORM_WINDOWS diff --git a/src/renderer/gl_backend.cc b/src/renderer/gl_backend.cc index 3c0486f8..2e1da0db 100644 --- a/src/renderer/gl_backend.cc +++ b/src/renderer/gl_backend.cc @@ -54,10 +54,17 @@ static GLenum cull_face[] = { GL_BACK // CULL_BACK }; -static GLenum blend_funcs[] = { - GL_NONE, GL_ZERO, GL_ONE, GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR, - GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_DST_ALPHA, GL_ONE_MINUS_DST_ALPHA, - GL_DST_COLOR, GL_ONE_MINUS_DST_COLOR}; +static GLenum blend_funcs[] = {GL_NONE, + GL_ZERO, + GL_ONE, + GL_SRC_COLOR, + GL_ONE_MINUS_SRC_COLOR, + GL_SRC_ALPHA, + GL_ONE_MINUS_SRC_ALPHA, + GL_DST_ALPHA, + GL_ONE_MINUS_DST_ALPHA, + GL_DST_COLOR, + GL_ONE_MINUS_DST_COLOR}; GLBackend::GLBackend(Window &window) : window_(window),