From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:37905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QO6bg-0004zo-Jh for qemu-devel@nongnu.org; Sun, 22 May 2011 07:14:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QO6bf-0004iE-MF for qemu-devel@nongnu.org; Sun, 22 May 2011 07:14:00 -0400 Received: from mail-qw0-f45.google.com ([209.85.216.45]:37917) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QO6bf-0004iA-ID for qemu-devel@nongnu.org; Sun, 22 May 2011 07:13:59 -0400 Received: by qwj8 with SMTP id 8so2887292qwj.4 for ; Sun, 22 May 2011 04:13:59 -0700 (PDT) MIME-Version: 1.0 From: Blue Swirl Date: Sun, 22 May 2011 14:13:39 +0300 Message-ID: Content-Type: multipart/mixed; boundary=0016367b639293970204a3db7322 Subject: [Qemu-devel] [PATCH 6/9] cpu-exec: unify do_interrupt call List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel --0016367b639293970204a3db7322 Content-Type: text/plain; charset=UTF-8 Now that all targets use common function signature for do_interrupt(), there is no need for the #ifdeffery anymore. Signed-off-by: Blue Swirl --- cpu-exec.c | 26 -------------------------- 1 files changed, 0 insertions(+), 26 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index 4aa75fd..dd4f5f5 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -272,33 +272,7 @@ int cpu_exec(CPUState *env1) ret = env->exception_index; break; #else -#if defined(TARGET_I386) - do_interrupt(env); -#elif defined(TARGET_PPC) - do_interrupt(env); -#elif defined(TARGET_LM32) - do_interrupt(env); -#elif defined(TARGET_MICROBLAZE) - do_interrupt(env); -#elif defined(TARGET_MIPS) - do_interrupt(env); -#elif defined(TARGET_SPARC) - do_interrupt(env); -#elif defined(TARGET_ARM) do_interrupt(env); -#elif defined(TARGET_UNICORE32) - do_interrupt(env); -#elif defined(TARGET_SH4) - do_interrupt(env); -#elif defined(TARGET_ALPHA) - do_interrupt(env); -#elif defined(TARGET_CRIS) - do_interrupt(env); -#elif defined(TARGET_M68K) - do_interrupt(env); -#elif defined(TARGET_S390X) - do_interrupt(env); -#endif env->exception_index = -1; #endif } -- 1.6.2.4 --0016367b639293970204a3db7322 Content-Type: text/x-diff; charset=US-ASCII; name="0006-cpu-exec-unify-do_interrupt-call.patch" Content-Disposition: attachment; filename="0006-cpu-exec-unify-do_interrupt-call.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gnzw2osi0 RnJvbSBjZTkxZmY0YjRlOGVlOWZkN2I0YmQ4ZTY2NDI0YTJlYTY1ZGJhZDViIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpNZXNzYWdlLUlkOiA8Y2U5MWZmNGI0ZThlZTlmZDdiNGJkOGU2NjQyNGEy ZWE2NWRiYWQ1Yi4xMzA2MDYyMzc2LmdpdC5ibGF1d2lyYmVsQGdtYWlsLmNvbT4KSW4tUmVwbHkt VG86IDxjODg3Y2M4NjFhOGE1MzFiNjM2YzBhY2FlMWUwNTRhMzg2MWFkMTVhLjEzMDYwNjIzNzYu Z2l0LmJsYXV3aXJiZWxAZ21haWwuY29tPgpSZWZlcmVuY2VzOiA8Yzg4N2NjODYxYThhNTMxYjYz NmMwYWNhZTFlMDU0YTM4NjFhZDE1YS4xMzA2MDYyMzc2LmdpdC5ibGF1d2lyYmVsQGdtYWlsLmNv bT4KRnJvbTogQmx1ZSBTd2lybCA8YmxhdXdpcmJlbEBnbWFpbC5jb20+CkRhdGU6IFNhdCwgMjEg TWF5IDIwMTEgMDg6MTc6MDggKzAwMDAKU3ViamVjdDogW1BBVENIIDYvOV0gY3B1LWV4ZWM6IHVu aWZ5IGRvX2ludGVycnVwdCBjYWxsCgpOb3cgdGhhdCBhbGwgdGFyZ2V0cyB1c2UgY29tbW9uIGZ1 bmN0aW9uIHNpZ25hdHVyZSBmb3IgZG9faW50ZXJydXB0KCksIHRoZXJlIGlzIG5vCm5lZWQgZm9y IHRoZSAjaWZkZWZmZXJ5IGFueW1vcmUuCgpTaWduZWQtb2ZmLWJ5OiBCbHVlIFN3aXJsIDxibGF1 d2lyYmVsQGdtYWlsLmNvbT4KLS0tCiBjcHUtZXhlYy5jIHwgICAyNiAtLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQogMSBmaWxlcyBjaGFuZ2VkLCAwIGluc2VydGlvbnMoKyksIDI2IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2NwdS1leGVjLmMgYi9jcHUtZXhlYy5jCmluZGV4IDRhYTc1ZmQu LmRkNGY1ZjUgMTAwNjQ0Ci0tLSBhL2NwdS1leGVjLmMKKysrIGIvY3B1LWV4ZWMuYwpAQCAtMjcy LDMzICsyNzIsNyBAQCBpbnQgY3B1X2V4ZWMoQ1BVU3RhdGUgKmVudjEpCiAgICAgICAgICAgICAg ICAgICAgIHJldCA9IGVudi0+ZXhjZXB0aW9uX2luZGV4OwogICAgICAgICAgICAgICAgICAgICBi cmVhazsKICNlbHNlCi0jaWYgZGVmaW5lZChUQVJHRVRfSTM4NikKLSAgICAgICAgICAgICAgICAg ICAgZG9faW50ZXJydXB0KGVudik7Ci0jZWxpZiBkZWZpbmVkKFRBUkdFVF9QUEMpCi0gICAgICAg ICAgICAgICAgICAgIGRvX2ludGVycnVwdChlbnYpOwotI2VsaWYgZGVmaW5lZChUQVJHRVRfTE0z MikKLSAgICAgICAgICAgICAgICAgICAgZG9faW50ZXJydXB0KGVudik7Ci0jZWxpZiBkZWZpbmVk KFRBUkdFVF9NSUNST0JMQVpFKQotICAgICAgICAgICAgICAgICAgICBkb19pbnRlcnJ1cHQoZW52 KTsKLSNlbGlmIGRlZmluZWQoVEFSR0VUX01JUFMpCi0gICAgICAgICAgICAgICAgICAgIGRvX2lu dGVycnVwdChlbnYpOwotI2VsaWYgZGVmaW5lZChUQVJHRVRfU1BBUkMpCi0gICAgICAgICAgICAg ICAgICAgIGRvX2ludGVycnVwdChlbnYpOwotI2VsaWYgZGVmaW5lZChUQVJHRVRfQVJNKQogICAg ICAgICAgICAgICAgICAgICBkb19pbnRlcnJ1cHQoZW52KTsKLSNlbGlmIGRlZmluZWQoVEFSR0VU X1VOSUNPUkUzMikKLSAgICAgICAgICAgICAgICAgICAgZG9faW50ZXJydXB0KGVudik7Ci0jZWxp ZiBkZWZpbmVkKFRBUkdFVF9TSDQpCi0JCSAgICBkb19pbnRlcnJ1cHQoZW52KTsKLSNlbGlmIGRl ZmluZWQoVEFSR0VUX0FMUEhBKQotICAgICAgICAgICAgICAgICAgICBkb19pbnRlcnJ1cHQoZW52 KTsKLSNlbGlmIGRlZmluZWQoVEFSR0VUX0NSSVMpCi0gICAgICAgICAgICAgICAgICAgIGRvX2lu dGVycnVwdChlbnYpOwotI2VsaWYgZGVmaW5lZChUQVJHRVRfTTY4SykKLSAgICAgICAgICAgICAg ICAgICAgZG9faW50ZXJydXB0KGVudik7Ci0jZWxpZiBkZWZpbmVkKFRBUkdFVF9TMzkwWCkKLSAg ICAgICAgICAgICAgICAgICAgZG9faW50ZXJydXB0KGVudik7Ci0jZW5kaWYKICAgICAgICAgICAg ICAgICAgICAgZW52LT5leGNlcHRpb25faW5kZXggPSAtMTsKICNlbmRpZgogICAgICAgICAgICAg ICAgIH0KLS0gCjEuNy4yLjUKCg== --0016367b639293970204a3db7322--