summaryrefslogtreecommitdiffstats
path: root/target-ia64
diff options
context:
space:
mode:
authorJes Sorensen <[email protected]>2008-09-04 17:40:09 +0200
committerAvi Kivity <[email protected]>2008-09-07 09:24:59 +0300
commit744843d03b9afd40e20e8930d5499257dbdf04a2 (patch)
tree21f78ca926597ac8f6d5b216659113871574bf07 /target-ia64
parent377878e7557549525206870b44453b68c04a4b7b (diff)
downloadqemu-kvm-744843d03b9afd40e20e8930d5499257dbdf04a2.tar.gz
qemu-kvm-744843d03b9afd40e20e8930d5499257dbdf04a2.tar.bz2
qemu-kvm-744843d03b9afd40e20e8930d5499257dbdf04a2.zip
Fix missing prototypes on ia64 and minor cleanups
Add missing prototypes to the ia64 header files. Remove unused variables T0/T1/T2 declared in exec.h and fix a small formatting issue to match the formatting style of qemu. Add 'const' to cpu_ia64_init() to match the rest of qemu. Signed-off-by: Jes Sorensen <[email protected]> Acked-by: Xiantao Zhang <[email protected]> Signed-off-by: Avi Kivity <[email protected]>
Diffstat (limited to 'target-ia64')
-rw-r--r--target-ia64/cpu.h18
-rw-r--r--target-ia64/exec.h6
-rw-r--r--target-ia64/op_helper.c2
3 files changed, 16 insertions, 10 deletions
diff --git a/target-ia64/cpu.h b/target-ia64/cpu.h
index e65e62895..28902e0fc 100644
--- a/target-ia64/cpu.h
+++ b/target-ia64/cpu.h
@@ -42,9 +42,9 @@
#include "softfloat.h"
typedef struct CPUIA64State {
- CPU_COMMON;
- uint32_t hflags;
- int mp_state;
+ CPU_COMMON;
+ uint32_t hflags;
+ int mp_state;
} CPUIA64State;
#define CPUState CPUIA64State
@@ -58,13 +58,23 @@ int cpu_exec(CPUState *env1);
void cpu_dump_state(CPUState *env, FILE *f,
int (*cpu_fprintf)(FILE *f, const char *fmt, ...),
int flags);
+CPUState *cpu_ia64_init(const char * cpu_model);
-CPUState *cpu_ia64_init(char * cpu_model);
static inline int cpu_mmu_index (CPUState *env)
{
return 0;
}
+#define CPU_PC_FROM_TB(env, tb) do{}while(0)
+
#include "cpu-all.h"
+/*
+ * These ones really should go to the appropriate tcg header file, if/when
+ * tcg support is added for ia64.
+ */
+void flush_icache_range(unsigned long start, unsigned long stop);
+void tcg_dump_info(FILE *f,
+ int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
+
#endif
diff --git a/target-ia64/exec.h b/target-ia64/exec.h
index 89c1fad7e..7d470560a 100644
--- a/target-ia64/exec.h
+++ b/target-ia64/exec.h
@@ -22,9 +22,6 @@
#include "cpu.h"
#include "exec-all.h"
-uint32_t T0;
-uint32_t T1;
-uint32_t T2;
#define tcg_qemu_tb_exec(tb_ptr) 0
@@ -36,8 +33,7 @@ static inline void regs_to_env(void)
{
}
-void tcg_dump_info(FILE *f,
- int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
+void do_interrupt (CPUState *env);
void cpu_lock(void);
void cpu_unlock(void);
diff --git a/target-ia64/op_helper.c b/target-ia64/op_helper.c
index f582023f4..74d30f9ef 100644
--- a/target-ia64/op_helper.c
+++ b/target-ia64/op_helper.c
@@ -27,7 +27,7 @@
#include "qemu-kvm.h"
#include "qemu-common.h"
-CPUState *cpu_ia64_init(char *cpu_model){
+CPUState *cpu_ia64_init(const char *cpu_model){
CPUState *env;
env = qemu_mallocz(sizeof(CPUState));
if (!env)