From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50652) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2S-0001Tx-A4 for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSH2Q-0005fG-9D for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:23 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35614 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2P-0005eI-Ux for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:22 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 10 May 2012 02:14:29 +0200 Message-Id: <1336608892-30501-52-git-send-email-afaerber@suse.de> In-Reply-To: <1336608892-30501-1-git-send-email-afaerber@suse.de> References: <1336608892-30501-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH next v2 51/74] target-cris: Reindent cpu_cris_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , =?UTF-8?q?Andreas=20F=C3=A4rber?= Judging by TCG variable initialization it used 8-char tabs; use 4 spaces instead. Also remove trailing whitespace. Signed-off-by: Andreas F=C3=A4rber --- target-cris/translate.c | 103 ++++++++++++++++++++++++-----------------= ------ 1 files changed, 52 insertions(+), 51 deletions(-) diff --git a/target-cris/translate.c b/target-cris/translate.c index e353ea3..a398057 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -3506,73 +3506,74 @@ static uint32_t vr_by_name(const char *name) CPUCRISState *cpu_cris_init (const char *cpu_model) { CRISCPU *cpu; - CPUCRISState *env; - static int tcg_initialized =3D 0; - int i; + CPUCRISState *env; + static int tcg_initialized =3D 0; + int i; =20 cpu =3D CRIS_CPU(object_new(TYPE_CRIS_CPU)); env =3D &cpu->env; =20 - env->pregs[PR_VR] =3D vr_by_name(cpu_model); + env->pregs[PR_VR] =3D vr_by_name(cpu_model); =20 cpu_reset(CPU(cpu)); - qemu_init_vcpu(env); + qemu_init_vcpu(env); =20 - if (tcg_initialized) - return env; + if (tcg_initialized) { + return env; + } =20 - tcg_initialized =3D 1; + tcg_initialized =3D 1; =20 #define GEN_HELPER 2 #include "helper.h" =20 - if (env->pregs[PR_VR] < 32) { - cpu_crisv10_init(env); - return env;=20 - } + if (env->pregs[PR_VR] < 32) { + cpu_crisv10_init(env); + return env; + } =20 =20 - cpu_env =3D tcg_global_reg_new_ptr(TCG_AREG0, "env"); - cc_x =3D tcg_global_mem_new(TCG_AREG0, - offsetof(CPUCRISState, cc_x), "cc_x"); - cc_src =3D tcg_global_mem_new(TCG_AREG0, - offsetof(CPUCRISState, cc_src), "cc_src"); - cc_dest =3D tcg_global_mem_new(TCG_AREG0, - offsetof(CPUCRISState, cc_dest), - "cc_dest"); - cc_result =3D tcg_global_mem_new(TCG_AREG0, - offsetof(CPUCRISState, cc_result), - "cc_result"); - cc_op =3D tcg_global_mem_new(TCG_AREG0, - offsetof(CPUCRISState, cc_op), "cc_op"); - cc_size =3D tcg_global_mem_new(TCG_AREG0, - offsetof(CPUCRISState, cc_size), - "cc_size"); - cc_mask =3D tcg_global_mem_new(TCG_AREG0, - offsetof(CPUCRISState, cc_mask), - "cc_mask"); + cpu_env =3D tcg_global_reg_new_ptr(TCG_AREG0, "env"); + cc_x =3D tcg_global_mem_new(TCG_AREG0, + offsetof(CPUCRISState, cc_x), "cc_x"); + cc_src =3D tcg_global_mem_new(TCG_AREG0, + offsetof(CPUCRISState, cc_src), "cc_src"= ); + cc_dest =3D tcg_global_mem_new(TCG_AREG0, + offsetof(CPUCRISState, cc_dest), + "cc_dest"); + cc_result =3D tcg_global_mem_new(TCG_AREG0, + offsetof(CPUCRISState, cc_result), + "cc_result"); + cc_op =3D tcg_global_mem_new(TCG_AREG0, + offsetof(CPUCRISState, cc_op), "cc_op"); + cc_size =3D tcg_global_mem_new(TCG_AREG0, + offsetof(CPUCRISState, cc_size), + "cc_size"); + cc_mask =3D tcg_global_mem_new(TCG_AREG0, + offsetof(CPUCRISState, cc_mask), + "cc_mask"); =20 - env_pc =3D tcg_global_mem_new(TCG_AREG0,=20 - offsetof(CPUCRISState, pc), - "pc"); - env_btarget =3D tcg_global_mem_new(TCG_AREG0, - offsetof(CPUCRISState, btarget), - "btarget"); - env_btaken =3D tcg_global_mem_new(TCG_AREG0, - offsetof(CPUCRISState, btaken), - "btaken"); - for (i =3D 0; i < 16; i++) { - cpu_R[i] =3D tcg_global_mem_new(TCG_AREG0, - offsetof(CPUCRISState, regs[i]), - regnames[i]); - } - for (i =3D 0; i < 16; i++) { - cpu_PR[i] =3D tcg_global_mem_new(TCG_AREG0, - offsetof(CPUCRISState, pregs[i]), - pregnames[i]); - } + env_pc =3D tcg_global_mem_new(TCG_AREG0, + offsetof(CPUCRISState, pc), + "pc"); + env_btarget =3D tcg_global_mem_new(TCG_AREG0, + offsetof(CPUCRISState, btarget), + "btarget"); + env_btaken =3D tcg_global_mem_new(TCG_AREG0, + offsetof(CPUCRISState, btaken), + "btaken"); + for (i =3D 0; i < 16; i++) { + cpu_R[i] =3D tcg_global_mem_new(TCG_AREG0, + offsetof(CPUCRISState, regs[i]), + regnames[i]); + } + for (i =3D 0; i < 16; i++) { + cpu_PR[i] =3D tcg_global_mem_new(TCG_AREG0, + offsetof(CPUCRISState, pregs[i]), + pregnames[i]); + } =20 - return env; + return env; } =20 void cpu_state_reset(CPUCRISState *env) --=20 1.7.7