- some cosmetic changes git-svn-id: svn://svn.berlios.de/openocd/trunk@423 b42882b7-edfa-0310-969c-e2dbd0fdcd60tags/v0.1.0
@@ -115,7 +115,7 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[] | |||||
OUTPUT("--help | -h\tdisplay this help\n"); | OUTPUT("--help | -h\tdisplay this help\n"); | ||||
OUTPUT("--version | -v\tdisplay OpenOCD version\n"); | OUTPUT("--version | -v\tdisplay OpenOCD version\n"); | ||||
OUTPUT("--file | -f\tuse configuration file <name>\n"); | OUTPUT("--file | -f\tuse configuration file <name>\n"); | ||||
OUTPUT("--search | -s\tdir to search for config files and scripts.\n"); | |||||
OUTPUT("--search | -s\tdir to search for config files and scripts\n"); | |||||
OUTPUT("--debug | -d\tset debug level <0-3>\n"); | OUTPUT("--debug | -d\tset debug level <0-3>\n"); | ||||
OUTPUT("--log_output | -l\tredirect log output to file <name>\n"); | OUTPUT("--log_output | -l\tredirect log output to file <name>\n"); | ||||
OUTPUT("--command | -c\trun <command>\n"); | OUTPUT("--command | -c\trun <command>\n"); | ||||
@@ -152,3 +152,4 @@ int main(int argc, char *argv[]) | |||||
return EXIT_SUCCESS; | return EXIT_SUCCESS; | ||||
} | } | ||||
@@ -32,7 +32,7 @@ | |||||
u32 arm_shift(u8 shift, u32 Rm, u32 shift_amount, u8 *carry) | u32 arm_shift(u8 shift, u32 Rm, u32 shift_amount, u8 *carry) | ||||
{ | { | ||||
u32 return_value; | |||||
u32 return_value = 0; | |||||
shift_amount &= 0xff; | shift_amount &= 0xff; | ||||
if (shift == 0x0) /* LSL */ | if (shift == 0x0) /* LSL */ | ||||
@@ -466,7 +466,7 @@ int arm_simulate_step(target_t *target, u32 *dry_run_pc) | |||||
/* load register instructions */ | /* load register instructions */ | ||||
else if ((instruction.type >= ARM_LDR) && (instruction.type <= ARM_LDRSH)) | else if ((instruction.type >= ARM_LDR) && (instruction.type <= ARM_LDRSH)) | ||||
{ | { | ||||
u32 load_address, modified_address, load_value; | |||||
u32 load_address = 0, modified_address = 0, load_value; | |||||
u32 Rn = buf_get_u32(ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, armv4_5->core_mode, instruction.info.load_store.Rn).value, 0, 32); | u32 Rn = buf_get_u32(ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, armv4_5->core_mode, instruction.info.load_store.Rn).value, 0, 32); | ||||
/* adjust Rn in case the PC is being read */ | /* adjust Rn in case the PC is being read */ | ||||