[Qemu-devel] [PATCH] Fix call_pal() prototype for alpha system emulation

[Qemu-devel] [PATCH] Fix call_pal() prototype for alpha system emulation

[Hervé Poussineau]

[-- Attachment #1: Type: text/plain, Size: 163 bytes --]

Hi,

- Fix call_pal() function prototype which is different depending of
CONFIG_USER_ONLY.
- Add cpu_reset() function, required for system emulation

Hervé

[-- Attachment #2: alpha.diff --]
[-- Type: text/plain, Size: 925 bytes --]

Index: target-alpha/cpu.h
===================================================================
--- target-alpha/cpu.h	(revision 5013)
+++ target-alpha/cpu.h	(working copy)
@@ -411,7 +411,11 @@
 int cpu_alpha_mtpr (CPUState *env, int iprn, uint64_t val, uint64_t *oldvalp);
 void cpu_loop_exit (void);
 void pal_init (CPUState *env);
+#if !defined (CONFIG_USER_ONLY)
+void call_pal (CPUState *env);
+#else
 void call_pal (CPUState *env, int palcode);
+#endif
 
 #define CPU_PC_FROM_TB(env, tb) env->pc = tb->pc
 
Index: target-alpha/translate.c
===================================================================
--- target-alpha/translate.c	(revision 5013)
+++ target-alpha/translate.c	(working copy)
@@ -2138,6 +2138,10 @@
     return env;
 }
 
+void cpu_reset (CPUAlphaState *env)
+{
+}
+
 void gen_pc_load(CPUState *env, TranslationBlock *tb,
                 unsigned long searched_pc, int pc_pos, void *puc)
 {

Re: [Qemu-devel] [PATCH] Fix call_pal() prototype for alpha system emulation

[Aurelien Jarno]

On Sat, Aug 16, 2008 at 06:08:28PM +0200, Hervé Poussineau wrote:
> Hi,
> 
> - Fix call_pal() function prototype which is different depending of
> CONFIG_USER_ONLY.

I have applied this part.

> - Add cpu_reset() function, required for system emulation

This is wrong, this has to be defined in hw/ along with the machine
code.

> Hervé

> Index: target-alpha/cpu.h
> ===================================================================
> --- target-alpha/cpu.h	(revision 5013)
> +++ target-alpha/cpu.h	(working copy)
> @@ -411,7 +411,11 @@
>  int cpu_alpha_mtpr (CPUState *env, int iprn, uint64_t val, uint64_t *oldvalp);
>  void cpu_loop_exit (void);
>  void pal_init (CPUState *env);
> +#if !defined (CONFIG_USER_ONLY)
> +void call_pal (CPUState *env);
> +#else
>  void call_pal (CPUState *env, int palcode);
> +#endif
>  
>  #define CPU_PC_FROM_TB(env, tb) env->pc = tb->pc
>  
> Index: target-alpha/translate.c
> ===================================================================
> --- target-alpha/translate.c	(revision 5013)
> +++ target-alpha/translate.c	(working copy)
> @@ -2138,6 +2138,10 @@
>      return env;
>  }
>  
> +void cpu_reset (CPUAlphaState *env)
> +{
> +}
> +
>  void gen_pc_load(CPUState *env, TranslationBlock *tb,
>                  unsigned long searched_pc, int pc_pos, void *puc)
>  {


-- 
  .''`.  Aurelien Jarno	            | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   aurel32@debian.org         | aurelien@aurel32.net
   `-    people.debian.org/~aurel32 | www.aurel32.net

Re: [Qemu-devel] [PATCH] Fix call_pal() prototype for alpha system emulation

[Laurent Desnogues]

On Tue, Sep 2, 2008 at 2:11 AM, Aurelien Jarno <aurelien@aurel32.net> wrote:
>
>> - Add cpu_reset() function, required for system emulation
>
> This is wrong, this has to be defined in hw/ along with the machine
> code.

All of the CPUs have cpu_reset in their respective translate.c or
helper.c which gets called by the machine definition in hw/.


Laurent