From patchwork Tue Jul 12 20:53:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 589804 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5817:0:0:0:0 with SMTP id j23csp678323max; Tue, 12 Jul 2022 14:02:37 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sLwtChL7G6fjvV4aO2zNrqhJIyjiMYx1Qwx2hR3Dcq14+GkfoCQv5swcxSm7zASq8KCHSi X-Received: by 2002:a05:620a:41:b0:6b5:5976:56e9 with SMTP id t1-20020a05620a004100b006b5597656e9mr123981qkt.199.1657659757382; Tue, 12 Jul 2022 14:02:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657659757; cv=none; d=google.com; s=arc-20160816; b=k6XfcYu88rmWK8Z55W5TUsZ55fncwCFqLOix1UH9MAb53mNEK9kOnJw7+j8n93utlq N/PkK3sXKs0zdgVuDinAH1VWkRn9Wxdls7NY25/l8lwd1UTgY4yh0PhOYh4/VLovAvhS 335WucFl2MC6k2lRESmCAARc2RPRSOXTlHdgdIhNxcviDS26zMXpHkAhuh4+w7HbfBTN yLvRY2arlL3h7MWrxtGW7eFOyxM6uRD5zOEtcvNsEluJE5FiejQCdVANwHnFSAC+wVOG uPdsrvdoS5hv6iDSAfnKeVSbggpuC8jRM1JJyctrQlzPPYk5qiX6WEPmYHiEORz4oFIB T5Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=from:reply-to:sender:errors-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:dkim-signature; bh=a+TbjQCV2xLA3zQIhvHGy53Lrzpawukh7l0Zf+LYs0I=; b=or8AT48kEIh+dIHFBEPGbz3rIN+hCu6+JXBPQUn6Kiew/Js6mb0HFiJ36rXmFNC+E/ Z0uXN7a90J1bsQ5h+/+stXTWbwt1eO+a7/ybdBUwHIrjk2uZaen5GVC0gxLu9w4CwFBm vZdJ1UvIT+c3ddGT/RWDlA57LvKt9whS3YeYNIpRyK8TBcEYIWxU8nwxd5oKRcs0pDdz 3hP/WcQwM7V2e/GSG6zO8JPZ97jQwlU1ypK5XJls0/eonf8YSwhslc1K2yu2zTEf3+iB XIAmtC5B4nULiFtGeWmlF0G1sLC5Da/7Lr1S2C3yP6A5fIHCtLEUo0p+kRUZ2cek3087 YVyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20210112 header.b=gEXAqPV+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id jl7-20020ad45e87000000b004704608181csi7110548qvb.363.2022.07.12.14.02.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Jul 2022 14:02:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20210112 header.b=gEXAqPV+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nongnu.org Received: from localhost ([::1]:51796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oBN1g-0007VL-W4 for patch@linaro.org; Tue, 12 Jul 2022 17:02:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBMu1-0006Jm-VL for qemu-devel@nongnu.org; Tue, 12 Jul 2022 16:54:41 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:41521) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oBMu0-0007H5-FS for qemu-devel@nongnu.org; Tue, 12 Jul 2022 16:54:41 -0400 Received: by mail-wr1-x432.google.com with SMTP id q9so12826830wrd.8 for ; Tue, 12 Jul 2022 13:54:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a+TbjQCV2xLA3zQIhvHGy53Lrzpawukh7l0Zf+LYs0I=; b=gEXAqPV+06vVfeG/juMBKje9J+k35r1OB9tC1z7sREhxx9HQKAjoZqHWLRFDBuWZr5 OnubCaL/sO06d7jJHipwGHKD5ydXU+0s/4f1OS+nA3jDOzmxdrdgJbBYXDl5gDXPFjaa VDr3tbSIwQqUVoGJ1DiN6jeVEnvHM0sbSd+hwCnCb4H+THBmkA5uka9sgz/KSm3w0ogO F4JBcP15kWR48HnBuKCNJrOYtT0H62m7kmuUrVBVAuDScS7jL551xxYsEo73JnBkz3Cd lkpOcAcm533Lm8HwKqMnIy5vbDqhJuO4xdPM/+fHg5Q1/YJTOJ9okvjORZ6lz6CV3Ho2 6nxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=a+TbjQCV2xLA3zQIhvHGy53Lrzpawukh7l0Zf+LYs0I=; b=WnuEvJYNeMNJd9G2mP64qTrYk2LRDC473+RZcnprJiW6W+HaOjzbcCOJuAvXEvtMfh 6x5aGJhOG3M15c6f0uXdW0VIwwx3WLCs6OXJQSyWLBEF8LARPoqeP2IMoBB9bBlNOlSh /2LbzDymfHAdqn1bjHDGZ7RzRlqQ/GZSc7PO6CpI8EIT2PzkUIQURxZ4IIAghmTd4I2A shmB1fGYUTeo6KAH+COhJxsGu11DT9AEZea2LFjeM+Gmn8N8puFAt/IsbYdviQmiwgyD fzFiyYV7K9RW9H1CCTWA2C87vBuP9j/eAk4cQBdBmcKIOTO37S+PutL1YnQTHMyZTEgy qfsw== X-Gm-Message-State: AJIora8qJuKeVhZAzusf+L18WPLsgN9K1vxZ3vuBB6pvDUguUY4FbAMe G6rolF2YwIBuT22QZNrMhye3y7533OLL64wP X-Received: by 2002:a5d:64ce:0:b0:21d:a952:31d5 with SMTP id f14-20020a5d64ce000000b0021da95231d5mr10013137wri.667.1657659278779; Tue, 12 Jul 2022 13:54:38 -0700 (PDT) Received: from localhost.localdomain ([185.126.107.38]) by smtp.gmail.com with ESMTPSA id n31-20020a05600c501f00b003a2c7bf0497sm82801wmr.16.2022.07.12.13.54.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 12 Jul 2022 13:54:38 -0700 (PDT) To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Aleksandar Rikalo , Richard Henderson Subject: [PULL 09/12] target/mips: Use error_report for UHI_assert Date: Tue, 12 Jul 2022 22:53:44 +0200 Message-Id: <20220712205347.58372-10-f4bug@amsat.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220712205347.58372-1-f4bug@amsat.org> References: <20220712205347.58372-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x432.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= From: Richard Henderson Always log the assert locally. Do not report_fault, but instead include the fact of the fault in the assertion. Don't bother freeing allocated strings before the abort(). Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220628111701.677216-6-richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé --- target/mips/tcg/sysemu/mips-semi.c | 39 ++++++++++++++---------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/target/mips/tcg/sysemu/mips-semi.c b/target/mips/tcg/sysemu/mips-semi.c index ad11a46820..ae4b8849b1 100644 --- a/target/mips/tcg/sysemu/mips-semi.c +++ b/target/mips/tcg/sysemu/mips-semi.c @@ -221,18 +221,6 @@ static int copy_argn_to_target(CPUMIPSState *env, int arg_num, } \ } while (0) -#define GET_TARGET_STRINGS_2(p, addr, p2, addr2) \ - do { \ - p = lock_user_string(addr); \ - if (!p) { \ - report_fault(env); \ - } \ - p2 = lock_user_string(addr2); \ - if (!p2) { \ - report_fault(env); \ - } \ - } while (0) - #define FREE_TARGET_STRING(p, gpr) \ do { \ unlock_user(p, gpr, 0); \ @@ -243,7 +231,7 @@ void mips_semihosting(CPUMIPSState *env) CPUState *cs = env_cpu(env); target_ulong *gpr = env->active_tc.gpr; const UHIOp op = gpr[25]; - char *p, *p2; + char *p; switch (op) { case UHI_exit: @@ -355,14 +343,23 @@ void mips_semihosting(CPUMIPSState *env) break; case UHI_assert: - GET_TARGET_STRINGS_2(p, gpr[4], p2, gpr[5]); - printf("assertion '"); - printf("\"%s\"", p); - printf("': file \"%s\", line %d\n", p2, (int)gpr[6]); - FREE_TARGET_STRING(p2, gpr[5]); - FREE_TARGET_STRING(p, gpr[4]); - abort(); - break; + { + const char *msg, *file; + + msg = lock_user_string(gpr[4]); + if (!msg) { + msg = ""; + } + file = lock_user_string(gpr[5]); + if (!file) { + file = ""; + } + + error_report("UHI assertion \"%s\": file \"%s\", line %d", + msg, file, (int)gpr[6]); + abort(); + } + default: error_report("Unknown UHI operation %d", op); abort();