From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LgpJY-0001wQ-08
	for qemu-devel@nongnu.org; Mon, 09 Mar 2009 19:55:20 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LgpJU-0001rb-6Y
	for qemu-devel@nongnu.org; Mon, 09 Mar 2009 19:55:19 -0400
Received: from [199.232.76.173] (port=58935 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LgpJT-0001qa-PE
	for qemu-devel@nongnu.org; Mon, 09 Mar 2009 19:55:15 -0400
Received: from pop-siberian.atl.sa.earthlink.net ([207.69.195.71]:61753)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <reif@earthlink.net>) id 1LgpJT-0004C1-9Y
	for qemu-devel@nongnu.org; Mon, 09 Mar 2009 19:55:15 -0400
Received: from user-142h2k8.cable.mindspring.com ([72.40.138.136]
	helo=[192.168.0.90])
	by pop-siberian.atl.sa.earthlink.net with esmtp (Exim 3.36 #1)
	id 1LgpJP-0000pW-00
	for qemu-devel@nongnu.org; Mon, 09 Mar 2009 19:55:12 -0400
Message-ID: <49B5AC5F.1030501@earthlink.net>
Date: Mon, 09 Mar 2009 19:55:11 -0400
From: Robert Reif <reif@earthlink.net>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------010008060504080801070500"
Subject: [Qemu-devel] [PATCH] target-sparc/helper.c
	cpu_sparc_handle_mmu_fault cleanup
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

This is a multi-part message in MIME format.
--------------010008060504080801070500
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Remove unnecessary else.

--------------010008060504080801070500
Content-Type: text/plain;
 name="helper.diff.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="helper.diff.txt"

Index: target-sparc/helper.c
===================================================================
--- target-sparc/helper.c	(revision 6798)
+++ target-sparc/helper.c	(working copy)
@@ -255,13 +255,13 @@
         prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
         ret = tlb_set_page_exec(env, vaddr, paddr, prot, mmu_idx, is_softmmu);
         return ret;
-    } else {
-        if (rw & 2)
-            env->exception_index = TT_TFAULT;
-        else
-            env->exception_index = TT_DFAULT;
-        return 1;
     }
+
+    if (rw & 2)
+        env->exception_index = TT_TFAULT;
+    else
+        env->exception_index = TT_DFAULT;
+    return 1;
 }
 
 target_ulong mmu_probe(CPUState *env, target_ulong address, int mmulev)

--------------010008060504080801070500--