imi415/openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Andreas Fritiofson <andreas.fritiofson@gmail.com> I noticed there are a few checks for (rt == 0xf) even though that case

Browse Source 
is handled with an early return at the top of the function.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2562 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2009-07-24 05:42:45 +00:00
parent 50aa561796
commit 431925a452
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/target/arm_disassembler.c
View File

@ -3523,8 +3523,6 @@ static int t2ev_load_halfword(uint32_t opcode, uint32_t address,
if ((opcode & (1 << 23)) == 0) {
if (rn == 0xf) {
ldrh_literal:
if (rt == 0xf)
return ERROR_INVALID_ARGUMENTS;
immed = opcode & 0xfff;
address = thumb_alignpc4(address);
if (opcode & (1 << 23))
@ -3535,8 +3533,6 @@ ldrh_literal:
sign, rt, address);
return ERROR_OK;
}
if (rt == 0xf)
return ERROR_INVALID_ARGUMENTS;
if (op2 == 0) {
int rm = opcode & 0xf;
@ -3574,12 +3570,11 @@ ldrh_literal:
} else {
if (rn == 0xf)
goto ldrh_literal;
if (rt != 0x0f) {
immed = opcode & 0xfff;
sprintf(cp, "LDR%sH.W\tr%d, [r%d, #%d]\t; %#6.6x",
sign, rt, rn, immed, immed);
return ERROR_OK;
}
immed = opcode & 0xfff;
sprintf(cp, "LDR%sH.W\tr%d, [r%d, #%d]\t; %#6.6x",
sign, rt, rn, immed, immed);
return ERROR_OK;
}
return ERROR_INVALID_ARGUMENTS;