summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--aes.c4
-rw-r--r--console.c1
-rw-r--r--cpu-exec.c1
-rw-r--r--exec.c3
-rw-r--r--hw/cirrus_vga.c6
-rw-r--r--hw/dma.c2
-rw-r--r--hw/eepro100.c19
-rw-r--r--hw/openpic.c1
-rw-r--r--hw/pckbd.c2
-rw-r--r--hw/piix_pci.c3
-rw-r--r--hw/sd.c2
-rw-r--r--hw/slavio_intctl.c1
-rw-r--r--hw/slavio_misc.c3
-rw-r--r--hw/vga.c12
-rw-r--r--loader.c1
-rw-r--r--slirp/misc.c1
-rw-r--r--slirp/socket.c1
-rw-r--r--slirp/tcp_subr.c1
-rw-r--r--target-arm/translate.c10
-rw-r--r--target-sparc/helper.c5
-rw-r--r--target-sparc/op_helper.c2
-rw-r--r--target-sparc/translate.c20
-rw-r--r--vl.c2
-rw-r--r--vnc.c2
24 files changed, 19 insertions, 86 deletions
diff --git a/aes.c b/aes.c
index 37008947f..7e84f4643 100644
--- a/aes.c
+++ b/aes.c
@@ -40,10 +40,6 @@ typedef uint32_t u32;
typedef uint16_t u16;
typedef uint8_t u8;
-#define MAXKC (256/32)
-#define MAXKB (256/8)
-#define MAXNR 14
-
/* This controls loop-unrolling in aes_core.c */
#undef FULL_UNROLL
# define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] << 8) ^ ((u32)(pt)[3]))
diff --git a/console.c b/console.c
index e37397d2a..52e3e57b8 100644
--- a/console.c
+++ b/console.c
@@ -28,7 +28,6 @@
//#define DEBUG_CONSOLE
#define DEFAULT_BACKSCROLL 512
#define MAX_CONSOLES 12
-#define DEFAULT_MONITOR_SIZE "800x600"
#define QEMU_RGBA(r, g, b, a) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
#define QEMU_RGB(r, g, b) QEMU_RGBA(r, g, b, 0xff)
diff --git a/cpu-exec.c b/cpu-exec.c
index 4e6d6adaf..bf42318fb 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -18,7 +18,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA
*/
#include "config.h"
-#define CPU_NO_GLOBAL_REGS
#include "exec.h"
#include "disas.h"
#if !defined(TARGET_IA64)
diff --git a/exec.c b/exec.c
index 784d746eb..67f3fa3da 100644
--- a/exec.c
+++ b/exec.c
@@ -68,9 +68,6 @@
#define SMC_BITMAP_USE_THRESHOLD 10
-#define MMAP_AREA_START 0x00000000
-#define MMAP_AREA_END 0xa8000000
-
#if defined(TARGET_SPARC64)
#define TARGET_PHYS_ADDR_SPACE_BITS 41
#elif defined(TARGET_SPARC)
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 2afb63ee2..dfbb59ad7 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -50,8 +50,6 @@
*
***************************************/
-#define qemu_MIN(a,b) ((a) < (b) ? (a) : (b))
-
// ID
#define CIRRUS_ID_CLGD5422 (0x23<<2)
#define CIRRUS_ID_CLGD5426 (0x24<<2)
@@ -174,10 +172,6 @@
#define CIRRUS_MMIO_LINEDRAW_MODE 0x39 // byte
#define CIRRUS_MMIO_BLTSTATUS 0x40 // byte
-// PCI 0x02: device
-#define PCI_DEVICE_CLGD5462 0x00d0
-#define PCI_DEVICE_CLGD5465 0x00d6
-
// PCI 0x04: command(word), 0x06(word): status
#define PCI_COMMAND_IOACCESS 0x0001
#define PCI_COMMAND_MEMACCESS 0x0002
diff --git a/hw/dma.c b/hw/dma.c
index 971c8d466..b95407be9 100644
--- a/hw/dma.c
+++ b/hw/dma.c
@@ -28,11 +28,9 @@
#define dolog(...) fprintf (stderr, "dma: " __VA_ARGS__)
#ifdef DEBUG_DMA
-#define lwarn(...) fprintf (stderr, "dma: " __VA_ARGS__)
#define linfo(...) fprintf (stderr, "dma: " __VA_ARGS__)
#define ldebug(...) fprintf (stderr, "dma: " __VA_ARGS__)
#else
-#define lwarn(...)
#define linfo(...)
#define ldebug(...)
#endif
diff --git a/hw/eepro100.c b/hw/eepro100.c
index 0094487bc..84b8b9d4b 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -47,22 +47,11 @@
/* Common declarations for all PCI devices. */
-#define PCI_VENDOR_ID 0x00 /* 16 bits */
#define PCI_DEVICE_ID 0x02 /* 16 bits */
#define PCI_COMMAND 0x04 /* 16 bits */
#define PCI_STATUS 0x06 /* 16 bits */
#define PCI_REVISION_ID 0x08 /* 8 bits */
-#define PCI_CLASS_CODE 0x0b /* 8 bits */
-#define PCI_SUBCLASS_CODE 0x0a /* 8 bits */
-#define PCI_HEADER_TYPE 0x0e /* 8 bits */
-
-#define PCI_BASE_ADDRESS_0 0x10 /* 32 bits */
-#define PCI_BASE_ADDRESS_1 0x14 /* 32 bits */
-#define PCI_BASE_ADDRESS_2 0x18 /* 32 bits */
-#define PCI_BASE_ADDRESS_3 0x1c /* 32 bits */
-#define PCI_BASE_ADDRESS_4 0x20 /* 32 bits */
-#define PCI_BASE_ADDRESS_5 0x24 /* 32 bits */
#define PCI_CONFIG_8(offset, value) \
(pci_conf[offset] = (value))
@@ -199,12 +188,6 @@ typedef enum {
ru_ready = 4
} ru_state_t;
-#if defined(__BIG_ENDIAN_BITFIELD)
-#define X(a,b) b,a
-#else
-#define X(a,b) a,b
-#endif
-
typedef struct {
#if 1
uint8_t cmd;
@@ -1465,8 +1448,6 @@ static int nic_can_receive(void *opaque)
//~ return !eepro100_buffer_full(s);
}
-#define MIN_BUF_SIZE 60
-
static void nic_receive(void *opaque, const uint8_t * buf, int size)
{
/* TODO:
diff --git a/hw/openpic.c b/hw/openpic.c
index 46a2706b3..733284ae8 100644
--- a/hw/openpic.c
+++ b/hw/openpic.c
@@ -44,7 +44,6 @@
#else
#define DPRINTF(fmt, args...) do { } while (0)
#endif
-#define ERROR(fmr, args...) do { printf("ERROR: " fmr , ##args); } while (0)
#define USE_MPCxxx /* Intel model is broken, for now */
diff --git a/hw/pckbd.c b/hw/pckbd.c
index 3a004f7a8..dd5265134 100644
--- a/hw/pckbd.c
+++ b/hw/pckbd.c
@@ -109,8 +109,6 @@
#define MOUSE_STATUS_ENABLED 0x20
#define MOUSE_STATUS_SCALE21 0x10
-#define KBD_QUEUE_SIZE 256
-
#define KBD_PENDING_KBD 1
#define KBD_PENDING_AUX 2
diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index 74460e186..8f3c96d73 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -216,9 +216,6 @@ PCIBus *i440fx_init(PCIDevice **pi440fx_state, qemu_irq *pic)
static PCIDevice *piix3_dev;
PCIDevice *piix4_dev;
-/* just used for simpler irq handling. */
-#define PCI_IRQ_WORDS ((PCI_DEVICES_MAX + 31) / 32)
-
static void piix3_set_irq(qemu_irq *pic, int irq_num, int level)
{
int i, pic_irq, pic_level;
diff --git a/hw/sd.c b/hw/sd.c
index fa1c02cf0..4618883fa 100644
--- a/hw/sd.c
+++ b/hw/sd.c
@@ -242,8 +242,6 @@ static void sd_set_cid(SDState *sd)
#define SECTOR_SHIFT 5 /* 16 kilobytes */
#define WPGROUP_SHIFT 7 /* 2 megs */
#define CMULT_SHIFT 9 /* 512 times HWBLOCK_SIZE */
-#define BLOCK_SIZE (1 << (HWBLOCK_SHIFT))
-#define SECTOR_SIZE (1 << (HWBLOCK_SHIFT + SECTOR_SHIFT))
#define WPGROUP_SIZE (1 << (HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT))
static const uint8_t sd_csd_rw_mask[16] = {
diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c
index dffa11539..9ee5ff89b 100644
--- a/hw/slavio_intctl.c
+++ b/hw/slavio_intctl.c
@@ -77,7 +77,6 @@ typedef struct SLAVIO_CPUINTCTLState {
#define MASTER_IRQ_MASK ~0x0fa2007f
#define MASTER_DISABLE 0x80000000
#define CPU_SOFTIRQ_MASK 0xfffe0000
-#define CPU_HARDIRQ_MASK 0x0000fffe
#define CPU_IRQ_INT15_IN 0x0004000
#define CPU_IRQ_INT15_MASK 0x80000000
diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c
index 79d4018fa..8da7f4ad9 100644
--- a/hw/slavio_misc.c
+++ b/hw/slavio_misc.c
@@ -56,10 +56,7 @@ typedef struct MiscState {
#define MISC_SIZE 1
#define SYSCTRL_SIZE 4
-#define LED_MAXADDR 1
-#define LED_SIZE (LED_MAXADDR + 1)
-#define MISC_MASK 0x0fff0000
#define MISC_LEDS 0x01600000
#define MISC_CFG 0x01800000
#define MISC_DIAG 0x01a00000
diff --git a/hw/vga.c b/hw/vga.c
index 1c633c54e..5bb22f9cc 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -1621,6 +1621,16 @@ static void vga_draw_graphic(VGAState *s, int full_update)
s->double_scan = double_scan;
}
+ if (shift_control == 0) {
+ if (s->sr[0x01] & 8) {
+ disp_width <<= 1;
+ }
+ } else if (shift_control == 1) {
+ if (s->sr[0x01] & 8) {
+ disp_width <<= 1;
+ }
+ }
+
depth = s->get_bpp(s);
if (s->line_offset != s->last_line_offset ||
disp_width != s->last_width ||
@@ -1662,7 +1672,6 @@ static void vga_draw_graphic(VGAState *s, int full_update)
full_update |= update_palette16(s);
if (s->sr[0x01] & 8) {
v = VGA_DRAW_LINE4D2;
- disp_width <<= 1;
} else {
v = VGA_DRAW_LINE4;
}
@@ -1671,7 +1680,6 @@ static void vga_draw_graphic(VGAState *s, int full_update)
full_update |= update_palette16(s);
if (s->sr[0x01] & 8) {
v = VGA_DRAW_LINE2D2;
- disp_width <<= 1;
} else {
v = VGA_DRAW_LINE2;
}
diff --git a/loader.c b/loader.c
index 55625cf5b..5232ee12a 100644
--- a/loader.c
+++ b/loader.c
@@ -199,7 +199,6 @@ static void bswap_ahdr(struct exec *e)
(N_MAGIC(x) == ZMAGIC ? _N_HDROFF((x)) + sizeof (struct exec) : \
(N_MAGIC(x) == QMAGIC ? 0 : sizeof (struct exec)))
#define N_TXTADDR(x) (N_MAGIC(x) == QMAGIC ? TARGET_PAGE_SIZE : 0)
-#define N_DATOFF(x) (N_TXTOFF(x) + (x).a_text)
#define _N_SEGMENT_ROUND(x) (((x) + TARGET_PAGE_SIZE - 1) & ~(TARGET_PAGE_SIZE - 1))
#define _N_TXTENDADDR(x) (N_TXTADDR(x)+(x).a_text)
diff --git a/slirp/misc.c b/slirp/misc.c
index 662039185..581db880d 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -5,7 +5,6 @@
* terms and conditions of the copyright.
*/
-#define WANT_SYS_IOCTL_H
#include <slirp.h>
u_int curtime, time_fasttimo, last_slowtimo;
diff --git a/slirp/socket.c b/slirp/socket.c
index 1c5dee35c..098132a1b 100644
--- a/slirp/socket.c
+++ b/slirp/socket.c
@@ -6,7 +6,6 @@
*/
#include "qemu-common.h"
-#define WANT_SYS_IOCTL_H
#include <slirp.h>
#include "ip_icmp.h"
#ifdef __sun__
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
index b70f06e06..9d020a662 100644
--- a/slirp/tcp_subr.c
+++ b/slirp/tcp_subr.c
@@ -38,7 +38,6 @@
* terms and conditions of the copyright.
*/
-#define WANT_SYS_IOCTL_H
#include <slirp.h>
/* patchable/settable parameters for tcp */
diff --git a/target-arm/translate.c b/target-arm/translate.c
index 7c3d4724d..f7f2a8d6f 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -2783,10 +2783,12 @@ static int disas_vfp_insn(CPUState * env, DisasContext *s, uint32_t insn)
} else if (size == 1) {
gen_neon_dup_low16(tmp);
}
- tmp2 = new_tmp();
- tcg_gen_mov_i32(tmp2, tmp);
- neon_store_reg(rn, 0, tmp2);
- neon_store_reg(rn, 1, tmp);
+ for (n = 0; n <= pass * 2; n++) {
+ tmp2 = new_tmp();
+ tcg_gen_mov_i32(tmp2, tmp);
+ neon_store_reg(rn, n, tmp2);
+ }
+ neon_store_reg(rn, n, tmp);
} else {
/* VMOV */
switch (size) {
diff --git a/target-sparc/helper.c b/target-sparc/helper.c
index 7a2ac21d0..b39b16272 100644
--- a/target-sparc/helper.c
+++ b/target-sparc/helper.c
@@ -1366,8 +1366,6 @@ void sparc_cpu_list(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...))
"fpu_version mmu_version nwindows\n");
}
-#define GET_FLAG(a,b) ((env->psr & a)?b:'-')
-
void cpu_dump_state(CPUState *env, FILE *f,
int (*cpu_fprintf)(FILE *f, const char *fmt, ...),
int flags)
@@ -1411,6 +1409,9 @@ void cpu_dump_state(CPUState *env, FILE *f,
env->cansave, env->canrestore, env->otherwin, env->wstate,
env->cleanwin, env->nwindows - 1 - env->cwp);
#else
+
+#define GET_FLAG(a,b) ((env->psr & a)?b:'-')
+
cpu_fprintf(f, "psr: 0x%08x -> %c%c%c%c %c%c%c wim: 0x%08x\n",
GET_PSR(env), GET_FLAG(PSR_ZERO, 'Z'), GET_FLAG(PSR_OVF, 'V'),
GET_FLAG(PSR_NEG, 'N'), GET_FLAG(PSR_CARRY, 'C'),
diff --git a/target-sparc/op_helper.c b/target-sparc/op_helper.c
index 2f88f4c1e..947a55ad1 100644
--- a/target-sparc/op_helper.c
+++ b/target-sparc/op_helper.c
@@ -29,8 +29,6 @@ do { printf("MXCC: " fmt , ##args); } while (0)
#ifdef DEBUG_ASI
#define DPRINTF_ASI(fmt, args...) \
do { printf("ASI: " fmt , ##args); } while (0)
-#else
-#define DPRINTF_ASI(fmt, args...) do {} while (0)
#endif
#ifdef TARGET_SPARC64
diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index 53997ae93..d059408ba 100644
--- a/target-sparc/translate.c
+++ b/target-sparc/translate.c
@@ -92,11 +92,9 @@ typedef struct DisasContext {
#define GET_FIELD_SPs(x,a,b) sign_extend (GET_FIELD_SP(x,a,b), ((b) - (a) + 1))
#ifdef TARGET_SPARC64
-#define FFPREG(r) (r)
#define DFPREG(r) (((r & 1) << 5) | (r & 0x1e))
#define QFPREG(r) (((r & 1) << 5) | (r & 0x1c))
#else
-#define FFPREG(r) (r)
#define DFPREG(r) (r & 0x1e)
#define QFPREG(r) (r & 0x1c)
#endif
@@ -2846,24 +2844,6 @@ static void disas_sparc_insn(DisasContext * dc)
#undef FMOVSCC
#undef FMOVDCC
#undef FMOVQCC
-#define FMOVCC(size_FDQ, icc) \
- { \
- TCGv r_cond; \
- int l1; \
- \
- l1 = gen_new_label(); \
- r_cond = tcg_temp_new(); \
- cond = GET_FIELD_SP(insn, 14, 17); \
- gen_cond(r_cond, icc, cond); \
- tcg_gen_brcondi_tl(TCG_COND_EQ, r_cond, \
- 0, l1); \
- glue(glue(gen_op_load_fpr_, size_FDQ), T0) \
- (glue(size_FDQ, FPREG(rs2))); \
- glue(glue(gen_op_store_, size_FDQ), T0_fpr) \
- (glue(size_FDQ, FPREG(rd))); \
- gen_set_label(l1); \
- tcg_temp_free(r_cond); \
- }
#define FMOVSCC(icc) \
{ \
TCGv r_cond; \
diff --git a/vl.c b/vl.c
index 03f5aaba1..5d4298ad7 100644
--- a/vl.c
+++ b/vl.c
@@ -2954,8 +2954,6 @@ static void dumb_display_init(void)
/***********************************************************/
/* I/O handling */
-#define MAX_IO_HANDLERS 64
-
typedef struct IOHandlerRecord {
int fd;
IOCanRWHandler *fd_read_poll;
diff --git a/vnc.c b/vnc.c
index 9a7750a87..a4fad9583 100644
--- a/vnc.c
+++ b/vnc.c
@@ -149,8 +149,6 @@ static const char *vnc_auth_name(VncDisplay *vd) {
return "unknown";
}
-#define VNC_SOCKET_FORMAT_PRETTY "local %s:%s"
-
static void do_info_vnc_client(Monitor *mon, VncState *client)
{
char *clientAddr =