summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Welwarsky <matthias.welwarsky@sysgo.com>2017-02-17 15:05:15 +0100
committerPaul Fertser <fercerpav@gmail.com>2017-02-24 09:35:41 +0000
commit2861ed533bfadac2b9259540e18c34c505ff2060 (patch)
tree4875bd012d4e0ec843588c96aaeb061588b97b07
parentbf1efe05bb71b7a6fe4ec1809a6aaa9b6073aede (diff)
armv8: spelling and formatting updates
small changes to correct code formatting and spelling of some log messages. Change-Id: I645e675f8f9f4731b0271ddc55f64e8cf56ec1db Signed-off-by: Matthias Welwarsky <matthias.welwarsky@sysgo.com> Reviewed-on: http://openocd.zylin.com/3994 Tested-by: jenkins Reviewed-by: Paul Fertser <fercerpav@gmail.com>
-rw-r--r--src/target/armv8.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/target/armv8.c b/src/target/armv8.c
index 2f1d5c1..db7a871 100644
--- a/src/target/armv8.c
+++ b/src/target/armv8.c
@@ -408,8 +408,7 @@ static int armv8_write_reg32(struct armv8_common *armv8, int regnum, uint64_t va
break;
case ARMV8_SP:
retval = dpm->instr_write_data_dcc(dpm,
- ARMV4_5_MRC(14, 0, 13, 0, 5, 0),
- value);
+ ARMV4_5_MRC(14, 0, 13, 0, 5, 0), value);
break;
case ARMV8_PC:/* PC
* read r0 from DCC; then "MOV pc, r0" */
@@ -505,10 +504,9 @@ int armv8_read_mpidr(struct armv8_common *armv8)
LOG_INFO("%s cluster %x core %x %s", target_name(armv8->arm.target),
armv8->cluster_id,
armv8->cpu_id,
- armv8->multi_processor_system == 0 ? "multi core" : "mono core");
-
+ armv8->multi_processor_system == 0 ? "multi core" : "single core");
} else
- LOG_ERROR("mpdir not in multiprocessor format");
+ LOG_ERROR("mpidr not in multiprocessor format");
done:
dpm->finish(dpm);
@@ -612,7 +610,7 @@ done:
/* (void) */ dpm->finish(dpm);
}
-static void armv8_show_fault_registers(struct target *target)
+static __unused void armv8_show_fault_registers(struct target *target)
{
struct armv8_common *armv8 = target_to_armv8(target);
@@ -836,9 +834,6 @@ int armv8_mmu_translate_va_pa(struct target *target, target_addr_t va,
if (retval != ERROR_OK)
return retval;
- if (retval != ERROR_OK)
- return retval;
-
if (par & 1) {
LOG_ERROR("Address translation failed at stage %i, FST=%x, PTW=%i",
((int)(par >> 9) & 1)+1, (int)(par >> 1) & 0x3f, (int)(par >> 8) & 1);