From nobody Tue Feb 10 04:55:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552406846336334.0274151494865; Tue, 12 Mar 2019 09:07:26 -0700 (PDT) Received: from localhost ([127.0.0.1]:55043 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3jvv-0003gP-36 for importer@patchew.org; Tue, 12 Mar 2019 12:07:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3jtb-0001sj-Ed for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:04:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3jou-0000OK-Lb for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:00:01 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:46870) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3jou-0000Nz-Ds for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:00:00 -0400 Received: by mail-wr1-x441.google.com with SMTP id 33so788402wrb.13 for ; Tue, 12 Mar 2019 09:00:00 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z10sm9431986wrs.11.2019.03.12.08.59.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 08:59:53 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2EA9C1FF93; Tue, 12 Mar 2019 15:59:48 +0000 (UTC) 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=HvEnLME5F0y2M2DUgb3/XRIKfhiNqOHIUO+BgV5guvE=; b=qJVu+MpWRiWMaoWd5isMK1vcD97QpmK59AIZcOqjvDGa/nBc7qd0M0ln6DWSGDykvC Y+mJYaC3G9fprmb1bQapihFkqkRufaTlzGDBZlGHAuAEIq6vOBwlmFqRp7MqmuozX+GY kFtu9d7Ag2c0E74MFBVH+MrEfcqSH5cacPdqWN8PfqSBDAN1MwRDImtsgkcRo7Pepx4M XS6CqWk00ef7uxw76RbWkTzZuTqMNxMblXKZjFVhGkpYN/eIpTSVNcmtuYgv82s/+j85 Kp2tlscZULYSB10eRIv+N+gfvdlgAV6dLHDhW9mSTjvM6l0Z78BMON9GqCsjQCKV13ax 0LTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HvEnLME5F0y2M2DUgb3/XRIKfhiNqOHIUO+BgV5guvE=; b=I154bdnaTurVdaU6DBXn5Cw35jMYVjKOAk3mpuasXqvYoCyiR9z/mSnoH1aQwOvJgR PQH1Z2sA7udfn9DBYJpj86gmrnFAvQfzyxniGwgrPoExK3uR72BOK50MC7yU8YA2A2zu PRN15csRHRi9wmV3dgLtVpLWrOUxLLb15+dh3+WLelpD4gSLhD+e1AQCCv8pgAUUNNiL amOCSQ9G1SBb8MfWAOWrv2hMWt0zcMjHh+nyTy0F9dUQa0C+nenLQnZ7+FVsuZ/G4XBi b9GMyFuzndUd4Bbc99DKtxcJ4LjYo/gRzcJHCjy5t7y4c9QpJz3g3g413nFlo8TDSSWW OAFA== X-Gm-Message-State: APjAAAUoNMBiDTcv3zBDtK2Bt0nUY9sdk5yVDsKkjrsAjGrZhBhqogiM Ek8m4+UQAxi6rBaSNCB7eh9crw== X-Google-Smtp-Source: APXvYqwK2v59+NAdv3qdPUC8bSKNvE2qrzQGdLZms9qCaa2vajOy2XReJT9sUcVN9iIU+Ew7hRv8pA== X-Received: by 2002:adf:f744:: with SMTP id z4mr16877811wrp.66.1552406399425; Tue, 12 Mar 2019 08:59:59 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:37 +0000 Message-Id: <20190312155947.14918-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH v4 11/21] tests/tcg/cris: cleanup sys.c 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: peter.maydell@linaro.org, famz@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This is a mini library which provides helper functions to the tests which are all currently written in assembly. A bunch of minor changes: - removed libc related headers (fedora-cris-cross is a system compile= r) - re-organised the functions to avoid forward declarations - cleaned up brace usage - restored exit for _fail case - removed tabs and fixed indentation Signed-off-by: Alex Benn=C3=A9e --- tests/tcg/cris/sys.c | 100 ++++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 48 deletions(-) diff --git a/tests/tcg/cris/sys.c b/tests/tcg/cris/sys.c index 21f08c0747..1644eecc33 100644 --- a/tests/tcg/cris/sys.c +++ b/tests/tcg/cris/sys.c @@ -1,59 +1,63 @@ -#include -#include -#include - -static inline int mystrlen(char *s) { - int i =3D 0; - while (s[i]) - i++; - return i; +/* + * Helper functions for CRIS system tests + * + * There is no libc and only a limited set of headers. + */ + +#include + +void exit(int status) +{ + register unsigned int callno asm ("r9") =3D 1; /* NR_exit */ + + asm volatile ("break 13\n" + : /* no outputs */ + : "r" (callno) + : "memory"); + while (1) { + /* do nothing */ + }; } =20 -void pass(void) { - char s[] =3D "passed.\n"; - write (1, s, sizeof (s) - 1); - exit (0); -} +size_t write(int fd, const void *buf, size_t count) +{ + register unsigned int callno asm ("r9") =3D 4; /* NR_write */ + register unsigned int r10 asm ("r10") =3D fd; + register const void *r11 asm ("r11") =3D buf; + register size_t r12 asm ("r12") =3D count; + register unsigned int r asm ("r10"); =20 -void _fail(char *reason) { - char s[] =3D "\nfailed: "; - int len =3D mystrlen(reason); - write (1, s, sizeof (s) - 1); - write (1, reason, len); - write (1, "\n", 1); -// exit (1); -} + asm volatile ("break 13\n" + : "=3Dr" (r) + : "r" (callno), "0" (r10), "r" (r11), "r" (r12) + : "memory"); =20 -void *memset (void *s, int c, size_t n) { - char *p =3D s; - int i; - for (i =3D 0; i < n; i++) - p[i] =3D c; - return p; + return r; } =20 -void exit (int status) { - register unsigned int callno asm ("r9") =3D 1; /* NR_exit */ - - asm volatile ("break 13\n" - : - : "r" (callno) - : "memory" ); - while(1) - ; +static inline int mystrlen(char *s) +{ + int i =3D 0; + while (s[i]) { + i++; + } + return i; } =20 -ssize_t write (int fd, const void *buf, size_t count) { - register unsigned int callno asm ("r9") =3D 4; /* NR_write */ - register unsigned int r10 asm ("r10") =3D fd; - register const void *r11 asm ("r11") =3D buf; - register size_t r12 asm ("r12") =3D count; - register unsigned int r asm ("r10"); =20 - asm volatile ("break 13\n" - : "=3Dr" (r) - : "r" (callno), "0" (r10), "r" (r11), "r" (r12) - : "memory"); +void pass(void) +{ + char s[] =3D "passed.\n"; + write(1, s, sizeof(s) - 1); + exit(0); +} =20 - return r; +void _fail(char *reason) +{ + char s[] =3D "\nfailed: "; + int len =3D mystrlen(reason); + write(1, s, sizeof(s) - 1); + write(1, reason, len); + write(1, "\n", 1); + exit(1); } --=20 2.20.1