From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:47167)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <guanxuetao@mprc.pku.edu.cn>) id 1TTOCk-0004x3-W0
	for qemu-devel@nongnu.org; Tue, 30 Oct 2012 22:38:55 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <guanxuetao@mprc.pku.edu.cn>) id 1TTOCj-0006UA-Fx
	for qemu-devel@nongnu.org; Tue, 30 Oct 2012 22:38:54 -0400
Received: from mprc.pku.edu.cn ([162.105.203.9]:55360)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <guanxuetao@mprc.pku.edu.cn>) id 1TTOCi-0006Qs-R9
	for qemu-devel@nongnu.org; Tue, 30 Oct 2012 22:38:53 -0400
From: guanxuetao@mprc.pku.edu.cn
Message-ID: <63660.162.105.203.8.1351652144.squirrel@mprc.pku.edu.cn>
In-Reply-To: <5cd15b325c56b2b7fe0b315c52a9b5094ce73633.1351436501.git.blauwirbel@gm
	ail.com>
References: <cover.1351436501.git.blauwirbel@gmail.com>
	<5cd15b325c56b2b7fe0b315c52a9b5094ce73633.1351436501.git.blauwirbel@gmail.com>
Date: Wed, 31 Oct 2012 10:55:44 +0800 (CST)
MIME-Version: 1.0
Content-Type: text/plain;charset=GB2312
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] [PATCH 3/5] target-unicore32: avoid using
	cpu_single_env
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Blue Swirl <blauwirbel@gmail.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>, qemu-devel@nongnu.org

> Pass around CPUState instead of using global cpu_single_env.
>
> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn>

> ---
>  target-unicore32/softmmu.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/target-unicore32/softmmu.c b/target-unicore32/softmmu.c
> index 9c2c54c..fc27100 100644
> --- a/target-unicore32/softmmu.c
> +++ b/target-unicore32/softmmu.c
> @@ -31,7 +31,7 @@
>
>
>  /* Map CPU modes onto saved register banks.  */
> -static inline int bank_number(int mode)
> +static inline int bank_number(CPUUniCore32State *env, int mode)
>  {
>      switch (mode) {
>      case ASR_MODE_USER:
> @@ -46,7 +46,7 @@ static inline int bank_number(int mode)
>      case ASR_MODE_INTR:
>          return 4;
>      }
> -    cpu_abort(cpu_single_env, "Bad mode %x\n", mode);
> +    cpu_abort(env, "Bad mode %x\n", mode);
>      return -1;
>  }
>
> @@ -60,12 +60,12 @@ void switch_mode(CPUUniCore32State *env, int mode)
>          return;
>      }
>
> -    i = bank_number(old_mode);
> +    i = bank_number(env, old_mode);
>      env->banked_r29[i] = env->regs[29];
>      env->banked_r30[i] = env->regs[30];
>      env->banked_bsr[i] = env->bsr;
>
> -    i = bank_number(mode);
> +    i = bank_number(env, mode);
>      env->regs[29] = env->banked_r29[i];
>      env->regs[30] = env->banked_r30[i];
>      env->bsr = env->banked_bsr[i];
> --
> 1.7.2.5
>