diff options
| author | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-03-25 15:45:17 +0000 |
|---|---|---|
| committer | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-03-25 15:45:17 +0000 |
| commit | d47e1b8f362379d8a2307f49e2b42115a3f40524 (patch) | |
| tree | 6b3276ca066bf34e165c28a3de71f84dbc98175d /src/target/arm_simulator.c | |
| parent | a96f96d1f0827c6b0eb5d67cb9a94a4084e36184 (diff) | |
| download | openocd+libswd-d47e1b8f362379d8a2307f49e2b42115a3f40524.tar.gz openocd+libswd-d47e1b8f362379d8a2307f49e2b42115a3f40524.tar.bz2 openocd+libswd-d47e1b8f362379d8a2307f49e2b42115a3f40524.tar.xz openocd+libswd-d47e1b8f362379d8a2307f49e2b42115a3f40524.zip | |
- rename log functions to stop conflicts under win32 (wingdi)
git-svn-id: svn://svn.berlios.de/openocd/trunk@523 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target/arm_simulator.c')
| -rw-r--r-- | src/target/arm_simulator.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/target/arm_simulator.c b/src/target/arm_simulator.c index b47606d6..40ca3567 100644 --- a/src/target/arm_simulator.c +++ b/src/target/arm_simulator.c @@ -160,7 +160,7 @@ u32 arm_shifter_operand(armv4_5_common_t *armv4_5, int variant, union arm_shifte } else { - ERROR("BUG: shifter_operand.variant not 0, 1 or 2"); + LOG_ERROR("BUG: shifter_operand.variant not 0, 1 or 2"); return_value = 0xffffffff; } @@ -253,7 +253,7 @@ int pass_condition(u32 cpsr, u32 opcode) } - ERROR("BUG: should never get here"); + LOG_ERROR("BUG: should never get here"); return 0; } @@ -444,7 +444,7 @@ int arm_simulate_step(target_t *target, u32 *dry_run_pc) else { buf_set_u32(ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, armv4_5->core_mode, instruction.info.data_proc.Rd).value, 0, 32, Rd); - WARNING("no updating of flags yet"); + LOG_WARNING("no updating of flags yet"); if (instruction.info.data_proc.Rd == 15) return ERROR_OK; @@ -460,7 +460,7 @@ int arm_simulate_step(target_t *target, u32 *dry_run_pc) } else { - WARNING("no updating of flags yet"); + LOG_WARNING("no updating of flags yet"); } } /* load register instructions */ @@ -497,7 +497,7 @@ int arm_simulate_step(target_t *target, u32 *dry_run_pc) } else { - ERROR("BUG: offset_mode neither 0 (offset) nor 1 (scaled register)"); + LOG_ERROR("BUG: offset_mode neither 0 (offset) nor 1 (scaled register)"); } if (instruction.info.load_store.index_mode == 0) |