diff options
Diffstat (limited to 'src')
31 files changed, 82 insertions, 78 deletions
diff --git a/src/helper/binarybuffer.c b/src/helper/binarybuffer.c index 12c9391..a8be403 100644 --- a/src/helper/binarybuffer.c +++ b/src/helper/binarybuffer.c @@ -55,7 +55,7 @@ const unsigned char bit_reverse_table256[] = u8* buf_cpy(u8 *from, u8 *to, int size) { - int num_bytes = CEIL(size, 8); + unsigned int num_bytes = CEIL(size, 8); unsigned int i; if (from == NULL) @@ -244,7 +244,7 @@ char* buf_to_str(const u8 *buf, int buf_len, int radix) int str_to_buf(const char *str, int str_len, u8 *buf, int buf_len, int radix) { char *charbuf; - u32 tmp; + char tmp; float factor; u8 *b256_buf; int b256_len; diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c index a9a4b30..c4a231e 100644 --- a/src/jtag/jtag.c +++ b/src/jtag/jtag.c @@ -1758,7 +1758,7 @@ static int jtag_tap_configure_cmd( Jim_GetOptInfo *goi, jtag_tap_t * tap) jteap = tap->event_action; /* replace existing? */ while (jteap) { - if (jteap->event == n->value) { + if (jteap->event == (enum jtag_tap_event)n->value) { break; } jteap = jteap->next; diff --git a/src/jtag/rlink/rlink.c b/src/jtag/rlink/rlink.c index 58067fb..af3a0f4 100644 --- a/src/jtag/rlink/rlink.c +++ b/src/jtag/rlink/rlink.c @@ -268,7 +268,7 @@ ep1_memory_write( USB_TIMEOUT_MS ); - if(usb_ret < sizeof(usb_buffer)) { + if((size_t)usb_ret < sizeof(usb_buffer)) { break; } @@ -363,7 +363,7 @@ dtc_load_from_buffer( buffer += sizeof(*header); length -= sizeof(*header); - if(length < header->length + 1) { + if(length < (size_t)header->length + 1) { LOG_ERROR("Malformed DTC image\n"); exit(1); } @@ -605,8 +605,8 @@ static struct { dtc_reply_queue_entry_t *rq_head; dtc_reply_queue_entry_t *rq_tail; - int cmd_index; - int reply_index; + u32 cmd_index; + u32 reply_index; u8 cmd_buffer[USB_EP2BANK_SIZE]; } dtc_queue; @@ -617,7 +617,7 @@ struct { static struct { - int length; + u32 length; u32 buffer; } tap_state_queue; diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c index 6cce199..7be6803 100644 --- a/src/pld/virtex2.c +++ b/src/pld/virtex2.c @@ -161,7 +161,7 @@ int virtex2_load(struct pld_device_s *pld_device, char *filename) virtex2_pld_device_t *virtex2_info = pld_device->driver_priv; xilinx_bit_file_t bit_file; int retval; - int i; + unsigned int i; scan_field_t field; diff --git a/src/pld/xilinx_bit.c b/src/pld/xilinx_bit.c index c8c825d..8dd2ee4 100644 --- a/src/pld/xilinx_bit.c +++ b/src/pld/xilinx_bit.c @@ -40,7 +40,7 @@ int read_section(FILE *input_file, int length_size, char section, u32 *buffer_length, u8 **buffer) { u8 length_buffer[4]; - u32 length; + int length; char section_char; int read_count; diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index 9ae345a..7ba5281 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -348,7 +348,7 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) char local_buffer[1024]; local_buffer[0] = '$'; - if (len+4 <= sizeof(local_buffer)) + if ((size_t)len + 4 <= sizeof(local_buffer)) { /* performance gain on smaller packets by only a single call to gdb_write() */ memcpy(local_buffer+1, buffer, len++); @@ -1213,7 +1213,7 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac { hex_buffer = malloc(len * 2 + 1); - int i; + u32 i; for (i = 0; i < len; i++) { u8 t = buffer[i]; @@ -1243,7 +1243,7 @@ int gdb_write_memory_packet(connection_t *connection, target_t *target, char *pa u8 *buffer; - int i; + u32 i; int retval; /* skip command character */ @@ -1540,12 +1540,12 @@ static int decode_xfer_read(char *buf, char **annex, int *ofs, unsigned int *len int gdb_calc_blocksize(flash_bank_t *bank) { - int i; - int block_size = 0xffffffff; + u32 i; + u32 block_size = 0xffffffff; /* loop through all sectors and return smallest sector size */ - for (i = 0; i < bank->num_sectors; i++) + for (i = 0; i < (u32)bank->num_sectors; i++) { if (bank->sectors[i].size < block_size) block_size = bank->sectors[i].size; diff --git a/src/svf/svf.c b/src/svf/svf.c index f1a52da..01e5631 100644 --- a/src/svf/svf.c +++ b/src/svf/svf.c @@ -103,7 +103,7 @@ const char *svf_trst_mode_name[4] = "ABSENT" }; -char *svf_tap_state_name[16]; +char *svf_tap_state_name[TAP_NUM_STATES]; #define XXR_TDI (1 << 0) #define XXR_TDO (1 << 1) @@ -316,7 +316,7 @@ static int handle_svf_command(struct command_context_s *cmd_ctx, char *cmd, char svf_buffer_size = 2 * SVF_MAX_BUFFER_SIZE_TO_COMMIT; memcpy(&svf_para, &svf_para_init, sizeof(svf_para)); - for (i = 0; i < dimof(svf_tap_state_name); i++) + for (i = 0; i < (int)dimof(svf_tap_state_name); i++) { svf_tap_state_name[i] = (char *)tap_state_name(i); } @@ -515,7 +515,7 @@ static int svf_tap_state_is_stable(tap_state_t state) static int svf_tap_state_is_valid(tap_state_t state) { - return ((state >= 0) && (state < sizeof(svf_tap_state_name))); + return state >= 0 && state < TAP_NUM_STATES; } static int svf_find_string_in_array(char *str, char **strs, int num_of_element) diff --git a/src/target/arm720t.h b/src/target/arm720t.h index d16e3e6..f91f150 100644 --- a/src/target/arm720t.h +++ b/src/target/arm720t.h @@ -32,7 +32,7 @@ typedef struct arm720t_common_s { - int common_magic; + u32 common_magic; armv4_5_mmu_common_t armv4_5_mmu; arm7tdmi_common_t arm7tdmi_common; u32 cp15_control_reg; diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c index cdf46a0..bae7c99 100644 --- a/src/target/arm7_9_common.c +++ b/src/target/arm7_9_common.c @@ -655,7 +655,8 @@ int arm7_9_target_request_data(target_t *target, u32 size, u8 *buffer) arm7_9_common_t *arm7_9 = armv4_5->arch_info; arm_jtag_t *jtag_info = &arm7_9->jtag_info; u32 *data; - int i, retval = ERROR_OK; + int retval = ERROR_OK; + u32 i; data = malloc(size * (sizeof(u32))); @@ -1956,7 +1957,7 @@ int arm7_9_read_memory(struct target_s *target, u32 address, u32 size, u32 count arm7_9_common_t *arm7_9 = armv4_5->arch_info; u32 reg[16]; - int num_accesses = 0; + u32 num_accesses = 0; int thisrun_accesses; int i; u32 cpsr; @@ -2133,7 +2134,7 @@ int arm7_9_write_memory(struct target_s *target, u32 address, u32 size, u32 coun reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL]; u32 reg[16]; - int num_accesses = 0; + u32 num_accesses = 0; int thisrun_accesses; int i; u32 cpsr; @@ -2466,7 +2467,7 @@ int arm7_9_checksum_memory(struct target_s *target, u32 address, u32 count, u32* 0x04C11DB7 /* CRC32XOR: .word 0x04C11DB7 */ }; - int i; + u32 i; if (target_alloc_working_area(target, sizeof(arm7_9_crc_code), &crc_algorithm) != ERROR_OK) { @@ -2518,7 +2519,7 @@ int arm7_9_blank_check_memory(struct target_s *target, u32 address, u32 count, u reg_param_t reg_params[3]; armv4_5_algorithm_t armv4_5_info; int retval; - int i; + u32 i; u32 erase_check_code[] = { diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h index 3cf9051..de2aef8 100644 --- a/src/target/arm7_9_common.h +++ b/src/target/arm7_9_common.h @@ -40,7 +40,7 @@ typedef struct arm7_9_common_s { - int common_magic; + u32 common_magic; arm_jtag_t jtag_info; reg_cache_t *eice_cache; diff --git a/src/target/arm920t.h b/src/target/arm920t.h index e51e651..e1aab34 100644 --- a/src/target/arm920t.h +++ b/src/target/arm920t.h @@ -32,7 +32,7 @@ typedef struct arm920t_common_s { - int common_magic; + u32 common_magic; armv4_5_mmu_common_t armv4_5_mmu; arm9tdmi_common_t arm9tdmi_common; u32 cp15_control_reg; diff --git a/src/target/arm926ejs.h b/src/target/arm926ejs.h index 1770555..ba5fcc1 100644 --- a/src/target/arm926ejs.h +++ b/src/target/arm926ejs.h @@ -32,7 +32,7 @@ typedef struct arm926ejs_common_s { - int common_magic; + u32 common_magic; armv4_5_mmu_common_t armv4_5_mmu; arm9tdmi_common_t arm9tdmi_common; int (*read_cp15)(target_t *target, u32 op1, u32 op2, u32 CRn, u32 CRm, u32 *value); diff --git a/src/target/arm_jtag.h b/src/target/arm_jtag.h index 11f6bd6..da004fc 100644 --- a/src/target/arm_jtag.h +++ b/src/target/arm_jtag.h @@ -30,9 +30,9 @@ typedef struct arm_jtag_s { jtag_tap_t *tap; - int scann_size; + u32 scann_size; u32 scann_instr; - int cur_scan_chain; + u32 cur_scan_chain; u32 intest_instr; } arm_jtag_t; diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c index 99f93bd..4a7fd7a 100644 --- a/src/target/armv4_5.c +++ b/src/target/armv4_5.c @@ -231,7 +231,7 @@ int armv4_5_set_core_reg(reg_t *reg, u8 *buf) } } - if (armv4_5_target->core_mode != (value & 0x1f)) + if (armv4_5_target->core_mode != (enum armv4_5_mode)(value & 0x1f)) { LOG_DEBUG("changing ARM core mode to '%s'", armv4_5_mode_strings[armv4_5_mode_to_number(value & 0x1f)]); armv4_5_target->core_mode = value & 0x1f; diff --git a/src/target/armv7m.c b/src/target/armv7m.c index f69f909..1bf6929 100644 --- a/src/target/armv7m.c +++ b/src/target/armv7m.c @@ -591,7 +591,7 @@ int armv7m_checksum_memory(struct target_s *target, u32 address, u32 count, u32* 0x1DB7, 0x04C1 /* CRC32XOR: .word 0x04C11DB7 */ }; - int i; + u32 i; if (target_alloc_working_area(target, sizeof(cortex_m3_crc_code), &crc_algorithm) != ERROR_OK) { @@ -640,7 +640,7 @@ int armv7m_blank_check_memory(struct target_s *target, u32 address, u32 count, u reg_param_t reg_params[3]; armv7m_algorithm_t armv7m_info; int retval; - int i; + u32 i; u16 erase_check_code[] = { diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c index e97b2be..f07bef0 100644 --- a/src/target/cortex_m3.c +++ b/src/target/cortex_m3.c @@ -1475,7 +1475,7 @@ int cortex_m3_target_request_data(target_t *target, u32 size, u8 *buffer) swjdp_common_t *swjdp = &cortex_m3->swjdp_info; u8 data; u8 ctrl; - int i; + u32 i; for (i = 0; i < (size * 4); i++) { diff --git a/src/target/embeddedice.c b/src/target/embeddedice.c index aa9e8f9..6a1cf05 100644 --- a/src/target/embeddedice.c +++ b/src/target/embeddedice.c @@ -484,7 +484,7 @@ int embeddedice_handshake(arm_jtag_t *jtag_info, int hsbit, u32 timeout) u8 field1_out[1]; u8 field2_out[1]; int retval; - int hsact; + u32 hsact; struct timeval lap; struct timeval now; @@ -544,7 +544,7 @@ int embeddedice_handshake(arm_jtag_t *jtag_info, int hsbit, u32 timeout) gettimeofday(&now, NULL); } - while ((now.tv_sec-lap.tv_sec)*1000 + (now.tv_usec-lap.tv_usec)/1000 <= timeout); + while ((u32)((now.tv_sec-lap.tv_sec)*1000 + (now.tv_usec-lap.tv_usec)/1000) <= timeout); return ERROR_TARGET_TIMEOUT; } diff --git a/src/target/etb.c b/src/target/etb.c index 9fa1f03..709bb00 100644 --- a/src/target/etb.c +++ b/src/target/etb.c @@ -453,7 +453,7 @@ int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cmd, char arm7_9->etm_ctx->capture_driver_priv = etb; etb->tap = tap; - etb->cur_scan_chain = -1; + etb->cur_scan_chain = ~0UL; etb->reg_cache = NULL; etb->ram_width = 0; etb->ram_depth = 0; diff --git a/src/target/etb.h b/src/target/etb.h index a41443b..f5f9cf4 100644 --- a/src/target/etb.h +++ b/src/target/etb.h @@ -46,17 +46,17 @@ typedef struct etb_s { etm_context_t *etm_ctx; jtag_tap_t *tap; - int cur_scan_chain; + u32 cur_scan_chain; reg_cache_t *reg_cache; /* ETB parameters */ - int ram_depth; - int ram_width; + u32 ram_depth; + u32 ram_width; } etb_t; typedef struct etb_reg_s { - int addr; + u32 addr; etb_t *etb; } etb_reg_t; diff --git a/src/target/etm.c b/src/target/etm.c index 2e422ee..06b97fe 100644 --- a/src/target/etm.c +++ b/src/target/etm.c @@ -647,7 +647,7 @@ int etmv1_branch_address(etm_context_t *ctx) u8 packet; int shift = 0; int apo; - int i; + u32 i; /* quit analysis if less than two cycles are left in the trace * because we can't extract the APO */ @@ -998,7 +998,7 @@ int etmv1_analyze_trace(etm_context_t *ctx, struct command_context_s *cmd_ctx) if (((instruction.type == ARM_B) || (instruction.type == ARM_BL) || (instruction.type == ARM_BLX)) && - (instruction.info.b_bl_bx_blx.target_address != -1)) + (instruction.info.b_bl_bx_blx.target_address != ~0UL)) { next_pc = instruction.info.b_bl_bx_blx.target_address; } @@ -1543,7 +1543,7 @@ int handle_etm_dump_command(struct command_context_s *cmd_ctx, char *cmd, char * armv4_5_common_t *armv4_5; arm7_9_common_t *arm7_9; etm_context_t *etm_ctx; - int i; + u32 i; if (argc != 1) { @@ -1611,7 +1611,7 @@ int handle_etm_load_command(struct command_context_s *cmd_ctx, char *cmd, char * armv4_5_common_t *armv4_5; arm7_9_common_t *arm7_9; etm_context_t *etm_ctx; - int i; + u32 i; if (argc != 1) { diff --git a/src/target/feroceon.c b/src/target/feroceon.c index c4fe17b..8ef74c1 100644 --- a/src/target/feroceon.c +++ b/src/target/feroceon.c @@ -517,7 +517,7 @@ int feroceon_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buf arm7_9_common_t *arm7_9 = armv4_5->arch_info; enum armv4_5_state core_state = armv4_5->core_state; u32 x, flip, shift, save[7]; - int i; + u32 i; /* * We can't use the dcc flow control bits, so let's transfer data @@ -547,7 +547,7 @@ int feroceon_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buf 0xeafffff3, /* b 3b */ }; - int dcc_size = sizeof(dcc_code); + u32 dcc_size = sizeof(dcc_code); if (!arm7_9->dcc_downloads) return target->type->write_memory(target, address, 4, count, buffer); diff --git a/src/target/mips32.h b/src/target/mips32.h index 9ada0b4..72035b4 100644 --- a/src/target/mips32.h +++ b/src/target/mips32.h @@ -47,7 +47,7 @@ typedef struct mips32_comparator_s typedef struct mips32_common_s { - int common_magic; + u32 common_magic; void *arch_info; reg_cache_t *core_cache; mips_ejtag_t ejtag_info; diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c index cbd30f9..df6fc23 100644 --- a/src/target/mips_ejtag.c +++ b/src/target/mips_ejtag.c @@ -40,7 +40,7 @@ int mips_ejtag_set_instr(mips_ejtag_t *ejtag_info, int new_instr, in_handler_t h if (tap==NULL) return ERROR_FAIL; - if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr) + if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != (u32)new_instr) { scan_field_t field; u8 t[4]; diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c index 7c0f7ab..55ea67c 100644 --- a/src/target/oocd_trace.c +++ b/src/target/oocd_trace.c @@ -78,7 +78,8 @@ int oocd_trace_write_reg(oocd_trace_t *oocd_trace, int reg, u32 value) int oocd_trace_read_memory(oocd_trace_t *oocd_trace, u8 *data, u32 address, u32 size) { - size_t bytes_written, bytes_read, bytes_to_read; + size_t bytes_written, bytes_to_read; + ssize_t bytes_read; u8 cmd; oocd_trace_write_reg(oocd_trace, OOCD_TRACE_ADDRESS, address); @@ -188,7 +189,7 @@ int oocd_trace_read_trace(etm_context_t *etm_ctx) u32 first_frame = 0x0; u32 num_frames = 1048576; u8 *trace_data; - int i; + u32 i; oocd_trace_read_reg(oocd_trace, OOCD_TRACE_STATUS, &status); oocd_trace_read_reg(oocd_trace, OOCD_TRACE_ADDRESS, &address); diff --git a/src/target/register.h b/src/target/register.h index 60ac8e5..f87ab9a 100644 --- a/src/target/register.h +++ b/src/target/register.h @@ -40,7 +40,7 @@ typedef struct reg_s u8 *value; int dirty; int valid; - int size; + u32 size; bitfield_desc_t *bitfield_desc; int num_bitfields; void *arch_info; diff --git a/src/target/target.c b/src/target/target.c index 569633b..abe7d46 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -985,7 +985,7 @@ int target_write_buffer(struct target_s *target, u32 address, u32 size, u8 *buff /* handle unaligned head bytes */ if (address % 4) { - int unaligned = 4 - (address % 4); + u32 unaligned = 4 - (address % 4); if (unaligned > size) unaligned = size; @@ -1060,7 +1060,7 @@ int target_read_buffer(struct target_s *target, u32 address, u32 size, u8 *buffe /* handle unaligned head bytes */ if (address % 4) { - int unaligned = 4 - (address % 4); + u32 unaligned = 4 - (address % 4); if (unaligned > size) unaligned = size; @@ -1100,7 +1100,7 @@ int target_checksum_memory(struct target_s *target, u32 address, u32 size, u32* { u8 *buffer; int retval; - int i; + u32 i; u32 checksum = 0; if (!target->type->examined) { @@ -2273,7 +2273,7 @@ int handle_verify_image_command_internal(struct command_context_s *cmd_ctx, char retval = target->type->read_memory(target, image.sections[i].base_address, size, count, data); if (retval == ERROR_OK) { - int t; + u32 t; for (t = 0; t < buf_cnt; t++) { if (data[t] != buffer[t]) @@ -2508,9 +2508,9 @@ static void writeString(FILE *f, char *s) } /* Dump a gmon.out histogram file. */ -static void writeGmon(u32 *samples, int sampleNum, char *filename) +static void writeGmon(u32 *samples, u32 sampleNum, char *filename) { - int i; + u32 i; FILE *f=fopen(filename, "w"); if (f==NULL) return; @@ -2539,8 +2539,8 @@ static void writeGmon(u32 *samples, int sampleNum, char *filename) int addressSpace=(max-min+1); - static int const maxBuckets=256*1024; /* maximum buckets. */ - int length=addressSpace; + static const u32 maxBuckets = 256 * 1024; /* maximum buckets. */ + u32 length = addressSpace; if (length > maxBuckets) { length=maxBuckets; @@ -2747,7 +2747,8 @@ static int target_mem2array(Jim_Interp *interp, target_t *target, int argc, Jim_ u32 v; const char *varname; u8 buffer[4096]; - int i, n, e, retval; + int n, e, retval; + u32 i; /* argv[1] = name of array to receive the data * argv[2] = desired width @@ -2928,7 +2929,8 @@ static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_ u32 v; const char *varname; u8 buffer[4096]; - int i, n, e, retval; + int n, e, retval; + u32 i; /* argv[1] = name of array to get the data * argv[2] = desired width @@ -3200,7 +3202,7 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target ) teap = target->event_action; /* replace existing? */ while( teap ){ - if( teap->event == n->value ){ + if( teap->event == (enum target_event)n->value ){ break; } teap = teap->next; diff --git a/src/target/target_request.c b/src/target/target_request.c index 9c8551f..1aa7d39 100644 --- a/src/target/target_request.c +++ b/src/target/target_request.c @@ -73,7 +73,7 @@ int target_hexmsg(target_t *target, int size, u32 length) char line[128]; int line_len; debug_msg_receiver_t *c = target->dbgmsg; - int i; + u32 i; LOG_DEBUG("size: %i, length: %i", size, length); diff --git a/src/target/trace.c b/src/target/trace.c index 93925cd..a9045c2 100644 --- a/src/target/trace.c +++ b/src/target/trace.c @@ -31,7 +31,7 @@ #include <string.h> #include <inttypes.h> -int trace_point(target_t *target, int number) +int trace_point(target_t *target, u32 number) { trace_t *trace = target->trace_info; @@ -60,7 +60,7 @@ int handle_trace_point_command(struct command_context_s *cmd_ctx, char *cmd, cha if (argc == 0) { - int i; + u32 i; for (i = 0; i < trace->num_trace_points; i++) { @@ -125,9 +125,9 @@ int handle_trace_history_command(struct command_context_s *cmd_ctx, char *cmd, c } else { - int i; - int first = 0; - int last = trace->trace_history_pos; + u32 i; + u32 first = 0; + u32 last = trace->trace_history_pos; if ( !trace->trace_history_size ) { command_print(cmd_ctx, "trace history buffer is not allocated"); diff --git a/src/target/trace.h b/src/target/trace.h index f7d9e5b..f0e92f9 100644 --- a/src/target/trace.h +++ b/src/target/trace.h @@ -32,12 +32,12 @@ typedef struct trace_point_s typedef struct trace_s { - int num_trace_points; - int trace_points_size; + u32 num_trace_points; + u32 trace_points_size; trace_point_t *trace_points; - int trace_history_size; + u32 trace_history_size; u32 *trace_history; - int trace_history_pos; + u32 trace_history_pos; int trace_history_overflowed; } trace_t; @@ -50,7 +50,7 @@ typedef enum trace_status TRACE_OVERFLOWED = 0x8, } trace_status_t; -extern int trace_point(struct target_s *target, int number); +extern int trace_point(struct target_s *target, u32 number); extern int trace_register_commands(struct command_context_s *cmd_ctx); #define ERROR_TRACE_IMAGE_UNAVAILABLE -(1500) diff --git a/src/target/xscale.c b/src/target/xscale.c index 007bdbd..c3b8d33 100644 --- a/src/target/xscale.c +++ b/src/target/xscale.c @@ -1631,7 +1631,7 @@ int xscale_deassert_reset(target_t *target) u32 binary_size; u32 buf_cnt; - int i; + u32 i; int retval; breakpoint_t *breakpoint = target->breakpoints; @@ -1928,7 +1928,7 @@ int xscale_read_memory(struct target_s *target, u32 address, u32 size, u32 count armv4_5_common_t *armv4_5 = target->arch_info; xscale_common_t *xscale = armv4_5->arch_info; u32 *buf32; - int i; + u32 i; int retval; LOG_DEBUG("address: 0x%8.8x, size: 0x%8.8x, count: 0x%8.8x", address, size, count); @@ -2933,7 +2933,7 @@ int xscale_analyze_trace(target_t *target, command_context_t *cmd_ctx) (((instruction.type == ARM_B) || (instruction.type == ARM_BL) || (instruction.type == ARM_BLX)) && - (instruction.info.b_bl_bx_blx.target_address != -1))) + (instruction.info.b_bl_bx_blx.target_address != ~0UL))) { xscale->trace.current_pc = instruction.info.b_bl_bx_blx.target_address; } diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c index eea5ff1..4e1f23e 100644 --- a/src/xsvf/xsvf.c +++ b/src/xsvf/xsvf.c @@ -743,7 +743,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha case XCOMMENT: { - int ndx = 0; + unsigned int ndx = 0; char comment[128]; do |