From: David B. <dbr...@us...> - 2009-12-08 11:02:49
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Main OpenOCD repository". The branch, master has been updated via ac19fc0da7e9b5542d5bcb9d6a6370efdeb2f1ee (commit) from 96d2b61c049773c02a41b220a0104d24c75fd284 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ac19fc0da7e9b5542d5bcb9d6a6370efdeb2f1ee Author: David Brownell <dbr...@us...> Date: Tue Dec 8 02:00:35 2009 -0800 ARM: cygwin complile fixes It's as if despite integers being 32-bits, GCC refuses to convert a "uint32_t" to one of them. Signed-off-by: David Brownell <dbr...@us...> diff --git a/src/target/arm_disassembler.c b/src/target/arm_disassembler.c index 407d290..5c8ad6a 100644 --- a/src/target/arm_disassembler.c +++ b/src/target/arm_disassembler.c @@ -158,14 +158,16 @@ static int evaluate_srs(uint32_t opcode, "\t0x%8.8" PRIx32 "\tSRS%s\tSP%s, #%d", address, opcode, - mode, wback, opcode & 0x1f); + mode, wback, + (unsigned)(opcode & 0x1f)); break; case 0x08100000: snprintf(instruction->text, 128, "0x%8.8" PRIx32 "\t0x%8.8" PRIx32 "\tRFE%s\tr%d%s", address, opcode, - mode, (opcode >> 16) & 0xf, wback); + mode, + (unsigned)((opcode >> 16) & 0xf), wback); break; default: return evaluate_unknown(opcode, address, instruction); @@ -3467,14 +3469,14 @@ static int t2ev_ldm_stm(uint32_t opcode, uint32_t address, case 6: sprintf(cp, "SRS%s\tsp%s, #%d", mode, t ? "!" : "", - opcode & 0x1f); + (unsigned) (opcode & 0x1f)); return ERROR_OK; case 1: mode = "DB"; /* FALL THROUGH */ case 7: sprintf(cp, "RFE%s\tr%d%s", mode, - (opcode >> 16) & 0xf, + (unsigned) ((opcode >> 16) & 0xf), t ? "!" : ""); return ERROR_OK; case 2: ----------------------------------------------------------------------- Summary of changes: src/target/arm_disassembler.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) hooks/post-receive -- Main OpenOCD repository |