From patchwork Wed Nov 8 22:58:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836077 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="Dd0Dd4VM"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yXMzD4wwpz9s4q for ; Thu, 9 Nov 2017 10:32:40 +1100 (AEDT) Received: from localhost ([::1]:34459 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZpm-0007gE-RL for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:32:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZMt-0000pc-1w for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZMp-0003jQ-Uw for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:47 -0500 Received: from mail-sn1nam01on0045.outbound.protection.outlook.com ([104.47.32.45]:42975 helo=NAM01-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eCZMp-0003i5-Lm for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=hRCsoIMW55UOloCGqecVJFTRMGJkuDQDQkI4SVbnKTY=; b=Dd0Dd4VMPYO4NlgAOMEdzWM+fAVP6Z5KGQST0Uh8a6xcT7z4SHkM9NYvZFYcAsvOHImy8NuLdwtt1CbacvGqZ+ny/KRacHBLxEgKmb5GMJwkpA4GuaMo/ovba9N+tk4woJyn/K/zNxbPEdy5MosWvnBwqBe/MCqpudjKEaZgd2o= Received: from SN4PR0201CA0033.namprd02.prod.outlook.com (10.162.76.19) by MWHPR02MB3279.namprd02.prod.outlook.com (10.164.187.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.218.12; Wed, 8 Nov 2017 23:02:40 +0000 Received: from CY1NAM02FT011.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::201) by SN4PR0201CA0033.outlook.office365.com (2603:10b6:803:2e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 23:02:39 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; aurel32.net; dkim=none (message not signed) header.d=none;aurel32.net; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by CY1NAM02FT011.mail.protection.outlook.com (10.152.75.156) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:02:38 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMk-0001NL-5X; Wed, 08 Nov 2017 15:02:38 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZMk-00037K-1c; Wed, 08 Nov 2017 15:02:38 -0800 Received: from xsj-pvapsmtp01 (smtp3.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N2WNo010378; Wed, 8 Nov 2017 15:02:32 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMe-00036Z-3L; Wed, 08 Nov 2017 15:02:32 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:33 -0800 Message-ID: <6374b4a21466bd49548817a37225ce496a8551c9.1510181732.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23450.000 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(376002)(346002)(2980300002)(438002)(189002)(199003)(54906003)(4326008)(36756003)(63266004)(316002)(2906002)(50986999)(76176999)(39060400002)(118296001)(189998001)(77096006)(478600001)(16586007)(5003940100001)(2351001)(50466002)(5660300001)(305945005)(81166006)(8676002)(48376002)(81156014)(106466001)(9786002)(36386004)(356003)(47776003)(33646002)(50226002)(8936002)(106002)(6916009)(2950100002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR02MB3279; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT011; 1:Plo171K4qVmb7ekfwGuD0amn3aTBp8/btgV3pfEv7NrRPp8UTcbxRvJvCNZQ6wDiIPK+ib5AQitY2sK5eZnwEjFR2z29Fw00eWpCu/SQkCmgb/S4a/iOa5BXfWWcqI9Z MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 14466e27-7a6e-4959-f881-08d526fccf43 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:MWHPR02MB3279; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3279; 3:T1FD3JgEqyFTupZ3sr0wTm4C2CTkHVlbQlPhs1SF4zmaFV2/pXNDA8WFTWhOgxaZUbr7F+e9F3JamX5vsDsd/uiJrus3M1kz0ge00t9XR51usNsY40/czToadjyUB1Ppc5NY7zM90PTUEDNf1LXwh1RPhnfd7BcARZUtkpT+Es3OTqn6QjeFC18IuaoSiQWPrlBlYPR3xiTVgRmzOevsQeUXkWCZ37nt22Vv7EcOEs4fPuiDDO6l8PoNi7HraKFQqti4wK+AB0IKbMpvKi8p+wULlkycY+HQXiHqpYrlqJtylBhMTlk6Y3+AHEgspI2yRDz9b/ky7iY/7fnxbZTFTJrerNDWW9oDqWEMH/f/bOk=; 25:rS+OCUuHkJh42eKvLgJ5LXFMU7Gzezj5pwM2gRf23ZD5wls8Pk5MXxh9H5/07oQX99gUloHPy07/sc8COVERloNpiTLKSFYfUy9uoXLWBzhEpYOIqpHVuuUAwCF+bxBxSSy5vGCN43rqBQo2ibxKh294MvqZqkDwqeVONVCPcoCIO6jffNfF65BbFFG85+sbxNC0wcqvLmW4VO9dIow+nLbso4lbb+30M22nIIfRstEDTZshPElNOYUvQLSUlZzTcnr4lBFiw6/Rz77BiEI1nopf6wNlxCa3d+xQ8ZQvsWLw49kwpQb8nkWASvi7KwI2OMJaJFAY9ybmyxnezmsA6A== X-MS-TrafficTypeDiagnostic: MWHPR02MB3279: X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3279; 31:utFhlaybtJyMg486EXHxx1r+4mY4t6BqCxrd7wpbnUY/BrK1slZjkZpVfrfoQo9iF+IFfJsyyPieV7skLgf/yxWtCgiy8UDPsIMweGcIvxUQJbBViJ3Kbx+CS4MnU4Gli8Jq5+e0SMdPkfES7Um+MXsNKmZQO0Cvqv4rNCB0U7kktIWIPDnHvIs9uBDbv0z75NeDrslb/6UWF8QaMNXlz8YxyZ7sAf+n+ZmFv6bqlz0=; 20:SKm8WiRK4NP18i05eXqwFAdvseQL7kdADbJMouIVC7cMvG4wv9Dxv6EFXhoyoIZrbiQOsneVHt9NdnWEcooW/ZgkwqMFy9KnaCmflAz+nfA0/UTtePDFpdH7J5NXQ5O6MbfP0FSapYaQF1HCkt4G9+8u+SGML5tFCXi7aFUsUGgzRWQyVKzIkgY1qw0wrxBubC4Jm5L91jLyyYtjR9GRqdYQbQl5d7MosRq56fJLfFvdafYMm1ghuOMgl3FkZqLGux7Hg68ymy/Rzzsbp8t3LtiS8B1w6cVSmo8+Os/eBSCinka2He5qKmLj8EM29MlqGhToKyPO7fMSCLZ79rol0agvAEIIOOZrsUwgaILOJXQkcL9eHRw+XadpBGmERF2cNa064qiXccA+Mr6KLnh82Qx1jNAjQBzywyzBPhoiAGkBa8PpZZNiKkrBv9F/oT94YmwGaLObnB5jSuWMHNVmTJbVVzeXJbS35Bpz3qAmU+uaq+rgD2WEnZPyFf1eTm4Y X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93004095)(3002001)(3231021)(100000703101)(100105400095)(6055026)(6041248)(20161123558100)(20161123564025)(20161123560025)(20161123555025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR02MB3279; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR02MB3279; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3279; 4:ArpIVf+J/lY9j6ervhTAMagqcMOaDiqejbZ/POP2g1X0s3zhWH/KXlS2Do2Z0LJUOiEsL/bLWq/AUUuMzZuBcbOVzH94LFt2zBvPbDmXax1q1LjL7JpTxPWwm7m3Vle0sLL5Wvc9TNbhNDF84Ja4OLB4CLUAQ5iCQxf4F0iaWPqmQaSVYsiv/+Qqznwciq4iVw4LBYdvK1tKqrv1mm4mHNxf7L5UDmM1fHeXXd5KOdtdmhjTaZf5B0CKsPq3+XqiEiSp9BLK3IhB8yb9PYHdJX6QZjeytxs54zxOpy1LAdlT58EN8U9zmJ/dpy85Peo9ivlCrFOJ06YOCoEoZfld3A== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR02MB3279; 23:rJDsTM12CnQkB3eUWbQVp5xUf6UANPQq/OLsXRDSX?= /QmozCcuEOXx6oibVL/1DZ5unVH5s7AIyMrApKMXDeLHj3VqBISXvQnpB3JPHz2c2FCNxf8wK0WDlPdZN+76MB8NruGyyjymwfcThzCVaOkcmr18GZGtFx73Czt8Jy9xfIciZNGxxkUACFqKqpfNIBrS1mSW8d9yXdzkEG9tcDdlpCSR9MWKwqpgMLBjysT381QaEpRn8p6xVWJJDTOZ8qE+fs4XumecT1YewC38ks0yAdVMqTt6drGRBH218rPc+J/aVtGdSkOZoK5NtnBRvPJzqmAjJlvxyAbOXkC4gxtlaquHbVBvCWhWVGHwinjFEkSdBJ3lorAICDNWOY/XgMlHWaSeyQenpg/IW8o0oQX/Bx9aN4MiSLis3HPKE2+MVOdDKdLK2/Xq4ZAQZvbEt3rvW0MQG1uJkqcnT9TLtaKfPrEEPs+ck4AuseZYWf6q8+MjNLfhe5za0992ul0cQIFLQ9vGckKqi5iSzncc73LsK6ijqo0OGoLiVl3Z9jLxCIfBjNbRPBFaG2dvn/m+FZmaTDMONlvawdftQ5+8bINKrSAyU7xRbpVjKCIKEqeYkZp/X9WKc/x8q4100P5axCwItZbeSZcN/ypZoH50hbZeo5MKrdicR4ZJZXMqda+U5Arv2ps/ih/z6VOH8MZTsUbyEnPVnw9PeB7erwpPDTMue1qX/yWFEzt683iTcbCxfp4l8f9meKW78ztsnDxTJ6sJSQxkhPfZ/w4VKTqfMmH5Twm1vtBubuZB+bMiQu+OuEVMuQEqOMxLAS9tcSAaL6sc39EunsembLyDUxV1laZrRjoahiE40TPOBhm2uq33tVcvHeHKnbgBd2NSQsWYoc98h3GnbCPkPqOSHbrBgHwoiGF0vf/FKRoWtJESJZoQmRujAt7MGcr+r3e4UtolyVViMsv7THfp+Iy7s2CYVCzGMPHnbS6SzBnXQnfIOxjYjjOPLMP+sNVEFSiCB4HXxwJBtxhFoyXJTqs5ZOWuRQyPg== X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3279; 6:aPlfu5qccXv/XOpbav86MjbNO7ORNBKVPKPisJPnoygenFVVCKSc9Pb4hBZHgrx55N/hcl63WvJTYkL6oV5wMY24xe1YSGJ3uFbkhayyooiDmPG24kyIMua2+KiDoSzs2S/kp5BNsl/s1NEu7ZTXhPcHe6YENYGgMpYIqhdf+XA2uuzbX5+7DD2AOAmab5XJ9swEaaVATojUSQLpwcgafiiLr223RluNBH1r1C6MwZ/nkYTCNv0yAqb5HNqlBwS8XmoTNtilS/r/ZnIAoQSmhNDgGUNV85FIxAwKwYVNuDJE8DuaT19OoyqTvplB8TsiDMmvehoIWZoHHkjc6BmGg9jswpCKVCNexuaGshpCfDI=; 5:EFQdIhDWl9oq21P0EKONgtV+EmZah0Q69hN9aHTcEshubNS/Y0GwgG3pua95tL2gv3ZdAy8hiZ7aOa71WtnlsR53OkbM32Ien94v1w3jGiUN8Z07YipY+Uq5QweZq6j+N22thSkeFUlO838p7qTZCy/+/mQJDd3/RHn0zgWJ9P8=; 24:E0KkCeUxN2xX71e/jcFrqoimz4gu5iOg7GPK41SyKhWPdod5ZjPDzUAWCPaVTdciyPt9MiGX2Eos0KI803JKbb5vJ02CXVmxy7YydeP/g/o=; 7:JbIV+7Y8+S+Xzz6aEJbHsMic4hGBIHTafbtmeBIGUQY4Jt0NEo7FABpqt2wjJkXCGjSbD+0qc6Ws+86rsIWS62/JcVyfeS5AnkcfWtx35VLIQfzlVmss834NfVE3upDORajYrAKJWFiHPOUwqBrQJFN/RVDVawAJYQ20vR7PtfmJTrKoPAI14g9F12rqH0vGOZDBwTSv44PlfYAO7UMeiYrtHxy5zmE5MJeQCC2DeayMUzOerlITq2sjrJrt47G8 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:38.9682 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 14466e27-7a6e-4959-f881-08d526fccf43 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR02MB3279 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.45 Subject: [Qemu-devel] [PATCH v4 35/45] hw/sh4: Replace fprintf(stderr, "*\n" with error_report() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, Magnus Damm , armbru@redhat.com, Aurelien Jarno , alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Replace a large number of the fprintf(stderr, "*\n" calls with error_report(). The functions were renamed with these commands and then compiler issues where manually fixed. find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + Some lines where then manually tweaked to pass checkpatch. Signed-off-by: Alistair Francis Cc: Magnus Damm Cc: Aurelien Jarno --- V2: - Split hw patch into individual directories hw/sh4/r2d.c | 9 ++++---- hw/sh4/sh7750.c | 64 +++++++++++++++++++++++++++++---------------------------- 2 files changed, 38 insertions(+), 35 deletions(-) diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 458ed83297..3ef7323f19 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -24,6 +24,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -314,8 +315,8 @@ static void r2d_init(MachineState *machine) SDRAM_BASE + LINUX_LOAD_OFFSET, INITRD_LOAD_OFFSET - LINUX_LOAD_OFFSET); if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename); - exit(1); + error_report("could not load kernel '%s'", kernel_filename); + exit(1); } /* initialization which should be done by firmware */ @@ -334,8 +335,8 @@ static void r2d_init(MachineState *machine) SDRAM_SIZE - INITRD_LOAD_OFFSET); if (initrd_size < 0) { - fprintf(stderr, "qemu: could not load initrd '%s'\n", initrd_filename); - exit(1); + error_report("could not load initrd '%s'", initrd_filename); + exit(1); } /* initialization which should be done by firmware */ diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index 166e4bd947..64ffc4c1d2 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -23,6 +23,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/sh4/sh.h" #include "sysemu/sysemu.h" @@ -147,9 +148,9 @@ static void porta_changed(SH7750State * s, uint16_t prev) int i, r = 0; #if 0 - fprintf(stderr, "porta changed from 0x%04x to 0x%04x\n", + error_report("porta changed from 0x%04x to 0x%04x", prev, porta_lines(s)); - fprintf(stderr, "pdtra=0x%04x, pctra=0x%08x\n", s->pdtra, s->pctra); + error_report("pdtra=0x%04x, pctra=0x%08x", s->pdtra, s->pctra); #endif currenta = porta_lines(s); if (currenta == prev) @@ -200,13 +201,13 @@ static void portb_changed(SH7750State * s, uint16_t prev) static void error_access(const char *kind, hwaddr addr) { - fprintf(stderr, "%s to %s (0x" TARGET_FMT_plx ") not supported\n", + error_report("%s to %s (0x" TARGET_FMT_plx ") not supported", kind, regname(addr), addr); } static void ignore_access(const char *kind, hwaddr addr) { - fprintf(stderr, "%s to %s (0x" TARGET_FMT_plx ") ignored\n", + error_report("%s to %s (0x" TARGET_FMT_plx ") ignored", kind, regname(addr), addr); } @@ -326,47 +327,48 @@ static void sh7750_mem_writew(void *opaque, hwaddr addr, uint16_t temp; switch (addr) { - /* SDRAM controller */ + /* SDRAM controller */ case SH7750_BCR2_A7: s->bcr2 = mem_value; return; case SH7750_BCR3_A7: - if(!has_bcr3_and_bcr4(s)) - error_access("word write", addr); - s->bcr3 = mem_value; - return; + if (!has_bcr3_and_bcr4(s)) { + error_access("word write", addr); + } + s->bcr3 = mem_value; + return; case SH7750_PCR_A7: - s->pcr = mem_value; - return; + s->pcr = mem_value; + return; case SH7750_RTCNT_A7: case SH7750_RTCOR_A7: case SH7750_RTCSR_A7: - ignore_access("word write", addr); - return; - /* IO ports */ + ignore_access("word write", addr); + return; + /* IO ports */ case SH7750_PDTRA_A7: - temp = porta_lines(s); - s->pdtra = mem_value; - porta_changed(s, temp); - return; + temp = porta_lines(s); + s->pdtra = mem_value; + porta_changed(s, temp); + return; case SH7750_PDTRB_A7: - temp = portb_lines(s); - s->pdtrb = mem_value; - portb_changed(s, temp); - return; + temp = portb_lines(s); + s->pdtrb = mem_value; + portb_changed(s, temp); + return; case SH7750_RFCR_A7: - fprintf(stderr, "Write access to refresh count register\n"); - s->rfcr = mem_value; - return; + error_report("Write access to refresh count register"); + s->rfcr = mem_value; + return; case SH7750_GPIOIC_A7: - s->gpioic = mem_value; - if (mem_value != 0) { - fprintf(stderr, "I/O interrupts not implemented\n"); + s->gpioic = mem_value; + if (mem_value != 0) { + error_report("I/O interrupts not implemented"); abort(); - } - return; + } + return; default: - error_access("word write", addr); + error_access("word write", addr); abort(); } }