diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2016-05-18 15:59:37 -0700 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2016-05-18 18:11:49 -0700 |
| commit | c713bce90183fa4ade82bc6f4b08280d32f1fb58 (patch) | |
| tree | 30331a4a3c19c4f85778dc96b4e5c203c0368729 /libpixelflinger | |
| parent | 9b0eb7cdf4ac4650fc3f476c2f5a91c50a18e524 (diff) | |
| download | system_core-c713bce90183fa4ade82bc6f4b08280d32f1fb58.tar.gz system_core-c713bce90183fa4ade82bc6f4b08280d32f1fb58.tar.bz2 system_core-c713bce90183fa4ade82bc6f4b08280d32f1fb58.zip | |
Fix misc-macro-parentheses warnings in init and other core modules.
Bug: 28705665
Change-Id: Ice67cebb8c42538f8fb9cf1756678f41a9d68a31
Diffstat (limited to 'libpixelflinger')
| -rw-r--r-- | libpixelflinger/codeflinger/disassem.c | 16 | ||||
| -rw-r--r-- | libpixelflinger/include/private/pixelflinger/ggl_context.h | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/libpixelflinger/codeflinger/disassem.c b/libpixelflinger/codeflinger/disassem.c index 39dd61461..5cbd63db8 100644 --- a/libpixelflinger/codeflinger/disassem.c +++ b/libpixelflinger/codeflinger/disassem.c @@ -279,14 +279,14 @@ static char const insn_fpaconstants[][8] = { "4.0", "5.0", "0.5", "10.0" }; -#define insn_condition(x) arm32_insn_conditions[(x >> 28) & 0x0f] -#define insn_blktrans(x) insn_block_transfers[(x >> 23) & 3] -#define insn_stkblktrans(x) insn_stack_block_transfers[(3*((x >> 20)&1))^((x >> 23)&3)] -#define op2_shift(x) op_shifts[(x >> 5) & 3] -#define insn_fparnd(x) insn_fpa_rounding[(x >> 5) & 0x03] -#define insn_fpaprec(x) insn_fpa_precision[(((x >> 18) & 2)|(x >> 7)) & 1] -#define insn_fpaprect(x) insn_fpa_precision[(((x >> 21) & 2)|(x >> 15)) & 1] -#define insn_fpaimm(x) insn_fpaconstants[x & 0x07] +#define insn_condition(x) arm32_insn_conditions[((x) >> 28) & 0x0f] +#define insn_blktrans(x) insn_block_transfers[((x) >> 23) & 3] +#define insn_stkblktrans(x) insn_stack_block_transfers[(3*(((x) >> 20)&1))^(((x) >> 23)&3)] +#define op2_shift(x) op_shifts[((x) >> 5) & 3] +#define insn_fparnd(x) insn_fpa_rounding[((x) >> 5) & 0x03] +#define insn_fpaprec(x) insn_fpa_precision[((((x) >> 18) & 2)|((x) >> 7)) & 1] +#define insn_fpaprect(x) insn_fpa_precision[((((x) >> 21) & 2)|((x) >> 15)) & 1] +#define insn_fpaimm(x) insn_fpaconstants[(x) & 0x07] /* Local prototypes */ static void disasm_register_shift(const disasm_interface_t *di, u_int insn); diff --git a/libpixelflinger/include/private/pixelflinger/ggl_context.h b/libpixelflinger/include/private/pixelflinger/ggl_context.h index d45dabcd0..563b0f119 100644 --- a/libpixelflinger/include/private/pixelflinger/ggl_context.h +++ b/libpixelflinger/include/private/pixelflinger/ggl_context.h @@ -120,7 +120,7 @@ inline GGLcolor gglFixedToIteratedColor(GGLfixed c) { template<bool> struct CTA; template<> struct CTA<true> { }; -#define GGL_CONTEXT(con, c) context_t *con = static_cast<context_t *>(c) +#define GGL_CONTEXT(con, c) context_t *(con) = static_cast<context_t *>(c) /* NOLINT */ #define GGL_OFFSETOF(field) uintptr_t(&(((context_t*)0)->field)) #define GGL_INIT_PROC(p, f) p.f = ggl_ ## f; #define GGL_BETWEEN(x, L, H) (uint32_t((x)-(L)) <= ((H)-(L))) @@ -136,14 +136,14 @@ const int GGL_PIXEL_PIPELINE_STATE = 0x00000004; // ---------------------------------------------------------------------------- #define GGL_RESERVE_NEEDS(name, l, s) \ - const uint32_t GGL_NEEDS_##name##_MASK = (((1LU<<(s))-1)<<l); \ + const uint32_t GGL_NEEDS_##name##_MASK = (((1LU<<(s))-1)<<(l)); \ const uint32_t GGL_NEEDS_##name##_SHIFT = (l); #define GGL_BUILD_NEEDS(val, name) \ (((val)<<(GGL_NEEDS_##name##_SHIFT)) & GGL_NEEDS_##name##_MASK) #define GGL_READ_NEEDS(name, n) \ - (uint32_t(n & GGL_NEEDS_##name##_MASK) >> GGL_NEEDS_##name##_SHIFT) + (uint32_t((n) & GGL_NEEDS_##name##_MASK) >> GGL_NEEDS_##name##_SHIFT) #define GGL_NEED_MASK(name) (uint32_t(GGL_NEEDS_##name##_MASK)) #define GGL_NEED(name, val) GGL_BUILD_NEEDS(val, name) |