From fc57b3c31b67cb8123c243bc117f3d47aef4d7fb Mon Sep 17 00:00:00 2001 From: "Jacob.Bramley@arm.com" Date: Mon, 4 Aug 2014 12:46:43 +0000 Subject: [PATCH] ARM64: Use ARRAY_SIZE where possible. BUG= R=svenpanne@chromium.org Review URL: https://codereview.chromium.org/437813004 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22816 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/arm64/assembler-arm64.cc | 5 ++--- src/arm64/instrument-arm64.cc | 3 +-- src/arm64/simulator-arm64.cc | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/arm64/assembler-arm64.cc b/src/arm64/assembler-arm64.cc index 4c47a02..a9b2a83 100644 --- a/src/arm64/assembler-arm64.cc +++ b/src/arm64/assembler-arm64.cc @@ -227,7 +227,7 @@ bool AreAliased(const CPURegister& reg1, const CPURegister& reg2, const CPURegister regs[] = {reg1, reg2, reg3, reg4, reg5, reg6, reg7, reg8}; - for (unsigned i = 0; i < sizeof(regs) / sizeof(regs[0]); i++) { + for (unsigned i = 0; i < ARRAY_SIZE(regs); i++) { if (regs[i].IsRegister()) { number_of_valid_regs++; unique_regs |= regs[i].Bit(); @@ -2658,8 +2658,7 @@ bool Assembler::IsImmLogical(uint64_t value, int multiplier_idx = CountLeadingZeros(d, kXRegSizeInBits) - 57; // Ensure that the index to the multipliers array is within bounds. DCHECK((multiplier_idx >= 0) && - (static_cast(multiplier_idx) < - (sizeof(multipliers) / sizeof(multipliers[0])))); + (static_cast(multiplier_idx) < ARRAY_SIZE(multipliers))); uint64_t multiplier = multipliers[multiplier_idx]; uint64_t candidate = (b - a) * multiplier; diff --git a/src/arm64/instrument-arm64.cc b/src/arm64/instrument-arm64.cc index a0adfc9..59982d9 100644 --- a/src/arm64/instrument-arm64.cc +++ b/src/arm64/instrument-arm64.cc @@ -107,8 +107,7 @@ Instrument::Instrument(const char* datafile, uint64_t sample_period) } } - static const int num_counters = - sizeof(kCounterList) / sizeof(CounterDescriptor); + static const int num_counters = ARRAY_SIZE(kCounterList); // Dump an instrumentation description comment at the top of the file. fprintf(output_stream_, "# counters=%d\n", num_counters); diff --git a/src/arm64/simulator-arm64.cc b/src/arm64/simulator-arm64.cc index 8268342..cde93db 100644 --- a/src/arm64/simulator-arm64.cc +++ b/src/arm64/simulator-arm64.cc @@ -1065,7 +1065,7 @@ void Simulator::PrintSystemRegisters(bool print_all) { "0b10 (Round towards Minus Infinity)", "0b11 (Round towards Zero)" }; - DCHECK(fpcr().RMode() <= (sizeof(rmode) / sizeof(rmode[0]))); + DCHECK(fpcr().RMode() < ARRAY_SIZE(rmode)); fprintf(stream_, "# %sFPCR: %sAHP:%d DN:%d FZ:%d RMode:%s%s\n", clr_flag_name, clr_flag_value, -- 2.7.4