提交 22ed1d34 编写于 作者: B Blue Swirl

arm: remove dead assignments, spotted by clang analyzer

Value stored is never read.
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>
上级 7f5b7d3e
...@@ -2515,7 +2515,6 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb) ...@@ -2515,7 +2515,6 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb)
{ {
func (stream, "<illegal constant %.8x:%x:%x>", func (stream, "<illegal constant %.8x:%x:%x>",
bits, cmode, op); bits, cmode, op);
size = 32;
break; break;
} }
switch (size) switch (size)
......
...@@ -2348,7 +2348,6 @@ static void omap_clkm_write(void *opaque, target_phys_addr_t addr, ...@@ -2348,7 +2348,6 @@ static void omap_clkm_write(void *opaque, target_phys_addr_t addr,
return; return;
case 0x0c: /* ARM_EWUPCT */ case 0x0c: /* ARM_EWUPCT */
diff = s->clkm.arm_ewupct ^ value;
s->clkm.arm_ewupct = value & 0x003f; s->clkm.arm_ewupct = value & 0x003f;
return; return;
......
...@@ -1968,7 +1968,7 @@ struct omap_eac_s *omap_eac_init(struct omap_target_agent_s *ta, ...@@ -1968,7 +1968,7 @@ struct omap_eac_s *omap_eac_init(struct omap_target_agent_s *ta,
s->irq = irq; s->irq = irq;
s->codec.rxdrq = *drq ++; s->codec.rxdrq = *drq ++;
s->codec.txdrq = *drq ++; s->codec.txdrq = *drq;
omap_eac_reset(s); omap_eac_reset(s);
#ifdef HAS_AUDIO #ifdef HAS_AUDIO
......
...@@ -126,7 +126,6 @@ static void sx1_init(ram_addr_t ram_size, ...@@ -126,7 +126,6 @@ static void sx1_init(ram_addr_t ram_size,
static uint32_t cs1val = 0x00215070; static uint32_t cs1val = 0x00215070;
static uint32_t cs2val = 0x00001139; static uint32_t cs2val = 0x00001139;
static uint32_t cs3val = 0x00001139; static uint32_t cs3val = 0x00001139;
ram_addr_t phys_flash;
DriveInfo *dinfo; DriveInfo *dinfo;
int fl_idx; int fl_idx;
uint32_t flash_size = flash0_size; uint32_t flash_size = flash0_size;
...@@ -140,7 +139,7 @@ static void sx1_init(ram_addr_t ram_size, ...@@ -140,7 +139,7 @@ static void sx1_init(ram_addr_t ram_size,
/* External Flash (EMIFS) */ /* External Flash (EMIFS) */
cpu_register_physical_memory(OMAP_CS0_BASE, flash_size, cpu_register_physical_memory(OMAP_CS0_BASE, flash_size,
(phys_flash = qemu_ram_alloc(flash_size)) | IO_MEM_ROM); qemu_ram_alloc(flash_size) | IO_MEM_ROM);
io = cpu_register_io_memory(static_readfn, static_writefn, &cs0val); io = cpu_register_io_memory(static_readfn, static_writefn, &cs0val);
cpu_register_physical_memory(OMAP_CS0_BASE + flash_size, cpu_register_physical_memory(OMAP_CS0_BASE + flash_size,
...@@ -171,8 +170,7 @@ static void sx1_init(ram_addr_t ram_size, ...@@ -171,8 +170,7 @@ static void sx1_init(ram_addr_t ram_size,
if ((version == 1) && if ((version == 1) &&
(dinfo = drive_get(IF_PFLASH, 0, fl_idx)) != NULL) { (dinfo = drive_get(IF_PFLASH, 0, fl_idx)) != NULL) {
cpu_register_physical_memory(OMAP_CS1_BASE, flash1_size, cpu_register_physical_memory(OMAP_CS1_BASE, flash1_size,
(phys_flash = qemu_ram_alloc(flash1_size)) | qemu_ram_alloc(flash1_size) | IO_MEM_ROM);
IO_MEM_ROM);
io = cpu_register_io_memory(static_readfn, static_writefn, &cs1val); io = cpu_register_io_memory(static_readfn, static_writefn, &cs1val);
cpu_register_physical_memory(OMAP_CS1_BASE + flash1_size, cpu_register_physical_memory(OMAP_CS1_BASE + flash1_size,
OMAP_CS1_SIZE - flash1_size, io); OMAP_CS1_SIZE - flash1_size, io);
......
...@@ -206,7 +206,6 @@ static void palmte_init(ram_addr_t ram_size, ...@@ -206,7 +206,6 @@ static void palmte_init(ram_addr_t ram_size,
static uint32_t cs1val = 0x0000e1a0; static uint32_t cs1val = 0x0000e1a0;
static uint32_t cs2val = 0x0000e1a0; static uint32_t cs2val = 0x0000e1a0;
static uint32_t cs3val = 0xe1a0e1a0; static uint32_t cs3val = 0xe1a0e1a0;
ram_addr_t phys_flash;
int rom_size, rom_loaded = 0; int rom_size, rom_loaded = 0;
DisplayState *ds = get_displaystate(); DisplayState *ds = get_displaystate();
...@@ -214,7 +213,7 @@ static void palmte_init(ram_addr_t ram_size, ...@@ -214,7 +213,7 @@ static void palmte_init(ram_addr_t ram_size,
/* External Flash (EMIFS) */ /* External Flash (EMIFS) */
cpu_register_physical_memory(OMAP_CS0_BASE, flash_size, cpu_register_physical_memory(OMAP_CS0_BASE, flash_size,
(phys_flash = qemu_ram_alloc(flash_size)) | IO_MEM_ROM); qemu_ram_alloc(flash_size) | IO_MEM_ROM);
io = cpu_register_io_memory(static_readfn, static_writefn, &cs0val); io = cpu_register_io_memory(static_readfn, static_writefn, &cs0val);
cpu_register_physical_memory(OMAP_CS0_BASE + flash_size, cpu_register_physical_memory(OMAP_CS0_BASE + flash_size,
......
...@@ -542,7 +542,9 @@ static int ctz32 (uint32_t n) ...@@ -542,7 +542,9 @@ static int ctz32 (uint32_t n)
} }
if (!(n & 0x1)) { if (!(n & 0x1)) {
ret++; ret++;
#if 0 /* This is not necessary as n is never 0 */
n = n >> 1; n = n >> 1;
#endif
} }
#if 0 /* This is not necessary as n is never 0 */ #if 0 /* This is not necessary as n is never 0 */
if (!n) if (!n)
......
...@@ -582,7 +582,9 @@ static int ctz32 (uint32_t n) ...@@ -582,7 +582,9 @@ static int ctz32 (uint32_t n)
} }
if (!(n & 0x1)) { if (!(n & 0x1)) {
ret++; ret++;
#if 0 /* This is not necessary as n is never 0 */
n = n >> 1; n = n >> 1;
#endif
} }
#if 0 /* This is not necessary as n is never 0 */ #if 0 /* This is not necessary as n is never 0 */
if (!n) if (!n)
......
...@@ -1143,12 +1143,8 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, ...@@ -1143,12 +1143,8 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
} }
static sd_rsp_type_t sd_app_command(SDState *sd, static sd_rsp_type_t sd_app_command(SDState *sd,
SDRequest req) { SDRequest req)
uint32_t rca; {
if (sd_cmd_type[req.cmd] == sd_ac || sd_cmd_type[req.cmd] == sd_adtc)
rca = req.arg >> 16;
DPRINTF("ACMD%d 0x%08x\n", req.cmd, req.arg); DPRINTF("ACMD%d 0x%08x\n", req.cmd, req.arg);
switch (req.cmd) { switch (req.cmd) {
case 6: /* ACMD6: SET_BUS_WIDTH */ case 6: /* ACMD6: SET_BUS_WIDTH */
......
...@@ -160,7 +160,6 @@ static void smc91c111_do_tx(smc91c111_state *s) ...@@ -160,7 +160,6 @@ static void smc91c111_do_tx(smc91c111_state *s)
int i; int i;
int len; int len;
int control; int control;
int add_crc;
int packetnum; int packetnum;
uint8_t *p; uint8_t *p;
...@@ -187,20 +186,22 @@ static void smc91c111_do_tx(smc91c111_state *s) ...@@ -187,20 +186,22 @@ static void smc91c111_do_tx(smc91c111_state *s)
len = 64; len = 64;
} }
#if 0 #if 0
/* The card is supposed to append the CRC to the frame. However {
none of the other network traffic has the CRC appended. int add_crc;
Suspect this is low level ethernet detail we don't need to worry
about. */ /* The card is supposed to append the CRC to the frame.
add_crc = (control & 0x10) || (s->tcr & TCR_NOCRC) == 0; However none of the other network traffic has the CRC
if (add_crc) { appended. Suspect this is low level ethernet detail we
uint32_t crc; don't need to worry about. */
add_crc = (control & 0x10) || (s->tcr & TCR_NOCRC) == 0;
crc = crc32(~0, p, len); if (add_crc) {
memcpy(p + len, &crc, 4); uint32_t crc;
len += 4;
crc = crc32(~0, p, len);
memcpy(p + len, &crc, 4);
len += 4;
}
} }
#else
add_crc = 0;
#endif #endif
if (s->ctr & CTR_AUTO_RELEASE) if (s->ctr & CTR_AUTO_RELEASE)
/* Race? */ /* Race? */
...@@ -670,14 +671,14 @@ static ssize_t smc91c111_receive(VLANClientState *nc, const uint8_t *buf, size_t ...@@ -670,14 +671,14 @@ static ssize_t smc91c111_receive(VLANClientState *nc, const uint8_t *buf, size_t
*(p++) = crc & 0xff; crc >>= 8; *(p++) = crc & 0xff; crc >>= 8;
*(p++) = crc & 0xff; crc >>= 8; *(p++) = crc & 0xff; crc >>= 8;
*(p++) = crc & 0xff; crc >>= 8; *(p++) = crc & 0xff; crc >>= 8;
*(p++) = crc & 0xff; crc >>= 8; *(p++) = crc & 0xff;
} }
if (size & 1) { if (size & 1) {
*(p++) = buf[size - 1]; *(p++) = buf[size - 1];
*(p++) = 0x60; *p = 0x60;
} else { } else {
*(p++) = 0; *(p++) = 0;
*(p++) = 0x40; *p = 0x40;
} }
/* TODO: Raise early RX interrupt? */ /* TODO: Raise early RX interrupt? */
s->int_level |= INT_RCV; s->int_level |= INT_RCV;
......
...@@ -721,7 +721,7 @@ static void spitz_ssp_attach(PXA2xxState *cpu) ...@@ -721,7 +721,7 @@ static void spitz_ssp_attach(PXA2xxState *cpu)
mux = ssi_create_slave(cpu->ssp[CORGI_SSP_PORT - 1], "corgi-ssp"); mux = ssi_create_slave(cpu->ssp[CORGI_SSP_PORT - 1], "corgi-ssp");
bus = qdev_get_child_bus(mux, "ssi0"); bus = qdev_get_child_bus(mux, "ssi0");
dev = ssi_create_slave(bus, "spitz-lcdtg"); ssi_create_slave(bus, "spitz-lcdtg");
bus = qdev_get_child_bus(mux, "ssi1"); bus = qdev_get_child_bus(mux, "ssi1");
dev = ssi_create_slave(bus, "ads7846"); dev = ssi_create_slave(bus, "ads7846");
......
...@@ -1367,7 +1367,7 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model, ...@@ -1367,7 +1367,7 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model,
gpio_out[GPIO_D][0] = qdev_get_gpio_in(mux, 0); gpio_out[GPIO_D][0] = qdev_get_gpio_in(mux, 0);
bus = qdev_get_child_bus(mux, "ssi0"); bus = qdev_get_child_bus(mux, "ssi0");
dev = ssi_create_slave(bus, "ssi-sd"); ssi_create_slave(bus, "ssi-sd");
bus = qdev_get_child_bus(mux, "ssi1"); bus = qdev_get_child_bus(mux, "ssi1");
dev = ssi_create_slave(bus, "ssd0323"); dev = ssi_create_slave(bus, "ssd0323");
......
...@@ -425,7 +425,6 @@ static uint32_t tusb_async_readw(void *opaque, target_phys_addr_t addr) ...@@ -425,7 +425,6 @@ static uint32_t tusb_async_readw(void *opaque, target_phys_addr_t addr)
return s->rx_config[epnum]; return s->rx_config[epnum];
case TUSB_EP_MAX_PACKET_SIZE_OFFSET ... case TUSB_EP_MAX_PACKET_SIZE_OFFSET ...
(TUSB_EP_MAX_PACKET_SIZE_OFFSET + 0x3b): (TUSB_EP_MAX_PACKET_SIZE_OFFSET + 0x3b):
epnum = (offset - TUSB_EP_MAX_PACKET_SIZE_OFFSET) >> 2;
return 0x00000000; /* TODO */ return 0x00000000; /* TODO */
case TUSB_WAIT_COUNT: case TUSB_WAIT_COUNT:
return 0x00; /* TODO */ return 0x00; /* TODO */
...@@ -630,7 +629,6 @@ static void tusb_async_writew(void *opaque, target_phys_addr_t addr, ...@@ -630,7 +629,6 @@ static void tusb_async_writew(void *opaque, target_phys_addr_t addr,
break; break;
case TUSB_EP_MAX_PACKET_SIZE_OFFSET ... case TUSB_EP_MAX_PACKET_SIZE_OFFSET ...
(TUSB_EP_MAX_PACKET_SIZE_OFFSET + 0x3b): (TUSB_EP_MAX_PACKET_SIZE_OFFSET + 0x3b):
epnum = (offset - TUSB_EP_MAX_PACKET_SIZE_OFFSET) >> 2;
return; /* TODO */ return; /* TODO */
case TUSB_WAIT_COUNT: case TUSB_WAIT_COUNT:
return; /* TODO */ return; /* TODO */
......
...@@ -62,12 +62,11 @@ static const uint8_t wm8750_vol_db_table[] = { ...@@ -62,12 +62,11 @@ static const uint8_t wm8750_vol_db_table[] = {
static inline void wm8750_in_load(WM8750State *s) static inline void wm8750_in_load(WM8750State *s)
{ {
int acquired;
if (s->idx_in + s->req_in <= sizeof(s->data_in)) if (s->idx_in + s->req_in <= sizeof(s->data_in))
return; return;
s->idx_in = audio_MAX(0, (int) sizeof(s->data_in) - s->req_in); s->idx_in = audio_MAX(0, (int) sizeof(s->data_in) - s->req_in);
acquired = AUD_read(*s->in[0], s->data_in + s->idx_in, AUD_read(*s->in[0], s->data_in + s->idx_in,
sizeof(s->data_in) - s->idx_in); sizeof(s->data_in) - s->idx_in);
} }
static inline void wm8750_out_flush(WM8750State *s) static inline void wm8750_out_flush(WM8750State *s)
......
...@@ -5242,7 +5242,6 @@ static int disas_neon_data_insn(CPUState * env, DisasContext *s, uint32_t insn) ...@@ -5242,7 +5242,6 @@ static int disas_neon_data_insn(CPUState * env, DisasContext *s, uint32_t insn)
if (!u) { if (!u) {
/* Extract. */ /* Extract. */
imm = (insn >> 8) & 0xf; imm = (insn >> 8) & 0xf;
count = q + 1;
if (imm > 7 && !q) if (imm > 7 && !q)
return 1; return 1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册