From patchwork Tue Jun 7 22:26:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 579447 Delivered-To: patch@linaro.org Received: by 2002:a5d:6706:0:0:0:0:0 with SMTP id o6csp3759308wru; Tue, 7 Jun 2022 16:27:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBa1/4RJ+sHhHZW61E+lrA8Ii4rJtsqetW2MPW8Miny8PiesX/3Yb9Hr34uznGfINudlvk X-Received: by 2002:a05:622a:58e:b0:304:da27:b691 with SMTP id c14-20020a05622a058e00b00304da27b691mr22688823qtb.601.1654644452599; Tue, 07 Jun 2022 16:27:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654644452; cv=none; d=google.com; s=arc-20160816; b=jzrWxSGmuw+Mz3pV8vYeqNpagyx7RuUL32Fj71wSLzgsjKs+K6eMYdXOYivET4FKDr rsv5LAcKIDgqnEDARckvSBXNQFzJfM3jKKLYGQCusr4MqeOJTmo/rBBNMUB03Td4imKA mQJ5qFkFflcnb+VdrdccDlLF7tTFz9qRMCZlbZzzzsY1WMd6jAGU593xcGv8kOW4ltd0 dltZ5bU2hEDdGCMxHzZnCpKYj8lizxud7um07XHu8LovKMye4CB9C//k51jDk/nTy6k7 BL4oiu3kHol5tSwMmhgPy0C+qXpX5NC4ba0h4jvnknRZFJdaySpnQd81bqFy51cOgutk sJAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=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 :from:dkim-signature; bh=bOpw6kxmi87dpdkEkilkb5+DQd7aJjfziEI5ji+nxm4=; b=QfJ6N8juwiRcDEGqWZzd/b7iEvTN1MCyFMgvi8xxB6DnRm+XfFqXSswj4WxLNojTwq m2F7PJeSVKX79a1tT1YGL+WKnfj6rpD7O38G3UabQnjjys2ZzO4g4XSduuH6tsuBDABs 5/Uch26P8qOuPaMuzht70cwj7vOTuDpLZMJxiKa/MClHghAdWDvE6ZsxIqwMyvwQdK1d ZR+EIr8MoSRquIK+sz9MyaIfinBGNfDhql6mSzoTXxHx5gLdAiuiMNVBRfd5XaVnpb9g CyyjHIRwMNKV73lGxlPT59Qd3F0/QkfTkMskNwMEIBaZQu8PxPiUO9vCCbRD5Eapqucx UomQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hyzrz15T; 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=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o17-20020a05622a139100b00304eacb2c87si4811556qtk.769.2022.06.07.16.27.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Jun 2022 16:27:32 -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=pass header.i=@linaro.org header.s=google header.b=hyzrz15T; 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=linaro.org Received: from localhost ([::1]:39552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyibk-0004i9-2R for patch@linaro.org; Tue, 07 Jun 2022 19:27:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyhef-0005in-Nr for qemu-devel@nongnu.org; Tue, 07 Jun 2022 18:26:29 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]:43696) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nyheX-0007vO-Ax for qemu-devel@nongnu.org; Tue, 07 Jun 2022 18:26:29 -0400 Received: by mail-pl1-x62a.google.com with SMTP id b5so15995724plx.10 for ; Tue, 07 Jun 2022 15:26:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bOpw6kxmi87dpdkEkilkb5+DQd7aJjfziEI5ji+nxm4=; b=hyzrz15TYzUF17CeVLOonEZS2zzErQPIL2uYxRGmTETIlRNsAHKxpdgD9chnNAzjQr 9LktInSlaClMX1CmWSeGtk0cooyYVd6m4GoU6p9EQ2x5m/xk2SehCe3zGiWo0yOI6txj zz4VAEExk+GvtQCbbR/UmzLgEoDBF/jhV4tHXrbscLDjaZPc9axPvws4Unp0J9QE4585 NwPjSU9C0OIWHKhpzfXKOgr2DztlHEZvKcMV3rFmmREcIUtHLtQIpG7FehvEw8nTvhr3 ktkMTudLg9CvMtEh35LxOfuFUYCnqX+7GO3XlxfzTH+VQdkBN0w++n1MXUW+cyVCP08r t0Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bOpw6kxmi87dpdkEkilkb5+DQd7aJjfziEI5ji+nxm4=; b=kFSZjcDx9w3DtbS8g9PO5JH2Z2FqqSVeA8rDiFLEUduoTmwe9BRfGA3NfwxctQHRru b7k5bfnd2qp5nghl1zoxyJA2Wi4VVvM7jwJmJ5tj+IV4Au0CkeQQ7YHFKjsGpTti5QxH SkCzeo6mpJVOT2itoiFEqgmRbtrKNfrjYGBJjInNgCzhg495znvRY+q0ibY/IC+PAa/M qPPianFtxwpOjlokhBDJ8YM5svs97MUsTeTNrKgymt4YgMyhvXc2ePri6pYl9Xs/irg0 Gv0ZWcDgM5sTJ8Q+2J1cAaJZp8Bj1lSRqMMAwX7Q1gxkf+K523ReyiBhd5FwIuYDzeN3 7qFw== X-Gm-Message-State: AOAM530vwckwH2NHQYEc4Vfe1WbZn1m7FKEo0mrwOHQkOu+4JzaCNvnB m+j1w+gSaX7qWpR9mCjGAlRqhd7lBJ0cqQ== X-Received: by 2002:a17:902:f64c:b0:156:7ceb:b579 with SMTP id m12-20020a170902f64c00b001567cebb579mr30456157plg.73.1654640779883; Tue, 07 Jun 2022 15:26:19 -0700 (PDT) Received: from stoup.. ([2602:ae:1547:e101:3cf2:c634:5b19:25f6]) by smtp.gmail.com with ESMTPSA id e19-20020a17090ae4d300b001e2fade86c1sm15112133pju.2.2022.06.07.15.26.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 15:26:19 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: laurent@vivier.eu Subject: [PATCH v4 2/3] target/m68k: Make semihosting system only Date: Tue, 7 Jun 2022 15:26:15 -0700 Message-Id: <20220607222616.717435-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220607222616.717435-1-richard.henderson@linaro.org> References: <20220607222616.717435-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=0.01 autolearn=ham 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" While we had a call to do_m68k_semihosting in linux-user, it wasn't actually reachable. We don't include DISAS_INSN(halt) as an instruction unless system mode. Signed-off-by: Richard Henderson Reviewed-by: Laurent Vivier --- linux-user/m68k/cpu_loop.c | 5 ----- target/m68k/m68k-semi.c | 36 ------------------------------------ target/m68k/meson.build | 6 ++++-- 3 files changed, 4 insertions(+), 43 deletions(-) diff --git a/linux-user/m68k/cpu_loop.c b/linux-user/m68k/cpu_loop.c index 3d3033155f..caead1cb74 100644 --- a/linux-user/m68k/cpu_loop.c +++ b/linux-user/m68k/cpu_loop.c @@ -36,11 +36,6 @@ void cpu_loop(CPUM68KState *env) process_queued_cpu_work(cs); switch(trapnr) { - case EXCP_HALT_INSN: - /* Semihosing syscall. */ - env->pc += 4; - do_m68k_semihosting(env, env->dregs[0]); - break; case EXCP_ILLEGAL: case EXCP_LINEA: case EXCP_LINEF: diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c index 37b409b0b9..d0697ddbd1 100644 --- a/target/m68k/m68k-semi.c +++ b/target/m68k/m68k-semi.c @@ -21,13 +21,8 @@ #include "cpu.h" #include "exec/gdbstub.h" -#if defined(CONFIG_USER_ONLY) -#include "qemu.h" -#define SEMIHOSTING_HEAP_SIZE (128 * 1024 * 1024) -#else #include "semihosting/softmmu-uaccess.h" #include "hw/boards.h" -#endif #include "qemu/log.h" #define HOSTED_EXIT 0 @@ -377,43 +372,12 @@ void do_m68k_semihosting(CPUM68KState *env, int nr) } break; case HOSTED_INIT_SIM: -#if defined(CONFIG_USER_ONLY) - { - CPUState *cs = env_cpu(env); - TaskState *ts = cs->opaque; - /* Allocate the heap using sbrk. */ - if (!ts->heap_limit) { - abi_ulong ret; - uint32_t size; - uint32_t base; - - base = do_brk(0); - size = SEMIHOSTING_HEAP_SIZE; - /* Try a big heap, and reduce the size if that fails. */ - for (;;) { - ret = do_brk(base + size); - if (ret >= (base + size)) { - break; - } - size >>= 1; - } - ts->heap_limit = base + size; - } - /* - * This call may happen before we have writable memory, so return - * values directly in registers. - */ - env->dregs[1] = ts->heap_limit; - env->aregs[7] = ts->stack_base; - } -#else /* * FIXME: This is wrong for boards where RAM does not start at * address zero. */ env->dregs[1] = current_machine->ram_size; env->aregs[7] = current_machine->ram_size; -#endif return; default: cpu_abort(env_cpu(env), "Unsupported semihosting syscall %d\n", nr); diff --git a/target/m68k/meson.build b/target/m68k/meson.build index 05cd9fbd1e..27d2d7ba87 100644 --- a/target/m68k/meson.build +++ b/target/m68k/meson.build @@ -4,14 +4,16 @@ m68k_ss.add(files( 'fpu_helper.c', 'gdbstub.c', 'helper.c', - 'm68k-semi.c', 'op_helper.c', 'softfloat.c', 'translate.c', )) m68k_softmmu_ss = ss.source_set() -m68k_softmmu_ss.add(files('monitor.c')) +m68k_softmmu_ss.add(files( + 'm68k-semi.c', + 'monitor.c' +)) target_arch += {'m68k': m68k_ss} target_softmmu_arch += {'m68k': m68k_softmmu_ss}