From patchwork Tue Mar 12 17:09:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 160150 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13365895jad; Tue, 12 Mar 2019 10:29:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqygameFyi19lze8LI94IbqXTWoP9jBcEVK3H5BKJOmjrnAKgAgTWvOUjIZWhhHvAvHfNxr2 X-Received: by 2002:a0d:e613:: with SMTP id p19mr9450035ywe.96.1552411754930; Tue, 12 Mar 2019 10:29:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411754; cv=none; d=google.com; s=arc-20160816; b=yPyCTI528wwKXUcWGLqF+BWjW2xOQ96OakGdzt0JlDSGDGaPqR/DuAFzS+EWVNABje iG+9nsPplbpl0tICiKiki3e6CYScipw0vW1Bh7HFD1ZA2WEZZa40xtRpABtIXq85Bmaj ifJJhwL4C8STVHS98n+0TlQ7WAMWvyGu8FFc5oIwmPzhylQmg3tzzU33YtqU2B0FYKzj EfW1MOGH3n5Yfk6I5Z68k2G7B4Dp7rNmGZiP+KKDf5gywnbHpSg1NyUQGI6kppxcndVF HlJCppZ0Ex1aBc0YHLla0AT0cF0XlE3zMqhrjYELtZFE1O8NAiQmUG8k5PBrtN8GecVe W81w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=BYfZmpe2piTIkl/J5xCfiY8Arya/eDd3uCzhP6JB7/0=; b=EpOCiSnoUKnjViCztdeOziH/wcLKOHtunv/2dXtkeBuoI58zH1dFtIe3UFdKQVnMHq UtFTNWzh8ru3+6K6UhT2nSY1JHuLu0qGYMvuzFW8NamNf5z97wUrVrHVV/D6SDc9fr+B 0fyjuRUeW/u5IvH/2tjJuhDg5/xGLLELAJkTw0A+O9C6CMg6DA/zCuOZ+CuIlRnx7l+f VmdzMmGb0UtRnePhL9HBOqmrEzHfUHVeOBjufUeOi0/FCqP+O3WbY37rNxyHdble//wM GZNpvM5ZdRCkkv5EdnRMzgLjnnHTmC8kX0YaSWUpC7K2gFnxFcT7NrNRLjmbkzsFis7m 2Dnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=h3eTSzmi; 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=fail (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 e82si5243924ybe.132.2019.03.12.10.29.14 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:29:14 -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=@linaro.org header.s=google header.b=h3eTSzmi; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:56405 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lDG-0006Zp-EN for patch@linaro.org; Tue, 12 Mar 2019 13:29:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2u-0005kf-8z for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kuS-000793-Sh for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:49 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:41071) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kuS-00078P-L3 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:48 -0400 Received: by mail-wr1-x443.google.com with SMTP id p1so3550256wrs.8 for ; Tue, 12 Mar 2019 10:09:48 -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=BYfZmpe2piTIkl/J5xCfiY8Arya/eDd3uCzhP6JB7/0=; b=h3eTSzmiVs5YSzbivF1dvWcMp907i1nicl1g5VTCHUfaSYIFrPg1SYbs3pcuMLyY31 uEIZ76+OUfkH3IYH0vYosJn6lETwna8s7z1HGRlnh+nBJ4IEq1UuTlLCvdkkZbw1ghd4 jYOf5SVJPA7lkZcoQBLV3ygAJWByl3qIEiO0SqlFjzNxbE+t6Irfaip8wnIjxhvosh2i pMQ31NTn3t8+WvS0py/RcwTl9eb2XEstgGJtiRf20q4sDMz8Ao0TXdk/k2ubq+75UFJI s3honkYD82xF6sUIgME9Y7knTJjuqgrcGrFWKoR7AUxK6FBepMwsdJuSfy9LuAxcUZLX S7Bw== 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=BYfZmpe2piTIkl/J5xCfiY8Arya/eDd3uCzhP6JB7/0=; b=Mz+dc1+05dZzAG2nOwU/PnlmhTmZqBQv8tWlzak+/U9r9E0TDqTySklz91W8sgutYT sIiyOy5qKX7Tk1A1ScjeJtMyB/Kxfp+/dEASuAV+XeJu+STWwSC779GeG+hcEMqOAZ3B XfNszNktARlgHhmvuW/XniXAvaKgoyjC7nXv6UYSiAKqLNf0OvfzulGCXhmWjRj/no6B xsTwvVIEYO6yKptrV1tIe5zbcbz0PyPqDl+N32Po9MYQ/9ofaxABEI/y6nHQi2VtLU8o ySF9Gu5b5h3mH1IZvYQlbvHT9sBUbGbgiWNb3oEq/IbIDV//HIfdpYHickiRfyaNW983 YvHQ== X-Gm-Message-State: APjAAAVZdaOCwgqyxGh5C5kAP2JSxT7qYuLZZgerUjy+ZsOHL3j1GXtx wo+M6sJzLLSsOEv62IxUWl91tw== X-Received: by 2002:adf:f4d0:: with SMTP id h16mr25654567wrp.103.1552410587371; Tue, 12 Mar 2019 10:09:47 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g10sm12722474wrq.61.2019.03.12.10.09.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:09:43 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2ED611FF9D; Tue, 12 Mar 2019 17:09:32 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:21 +0000 Message-Id: <20190312170931.25013-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PULL 16/26] 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 compiler) - 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ée -- 2.20.1 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 = 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") = 1; /* NR_exit */ + + asm volatile ("break 13\n" + : /* no outputs */ + : "r" (callno) + : "memory"); + while (1) { + /* do nothing */ + }; } -void pass(void) { - char s[] = "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") = 4; /* NR_write */ + register unsigned int r10 asm ("r10") = fd; + register const void *r11 asm ("r11") = buf; + register size_t r12 asm ("r12") = count; + register unsigned int r asm ("r10"); -void _fail(char *reason) { - char s[] = "\nfailed: "; - int len = mystrlen(reason); - write (1, s, sizeof (s) - 1); - write (1, reason, len); - write (1, "\n", 1); -// exit (1); -} + asm volatile ("break 13\n" + : "=r" (r) + : "r" (callno), "0" (r10), "r" (r11), "r" (r12) + : "memory"); -void *memset (void *s, int c, size_t n) { - char *p = s; - int i; - for (i = 0; i < n; i++) - p[i] = c; - return p; + return r; } -void exit (int status) { - register unsigned int callno asm ("r9") = 1; /* NR_exit */ - - asm volatile ("break 13\n" - : - : "r" (callno) - : "memory" ); - while(1) - ; +static inline int mystrlen(char *s) +{ + int i = 0; + while (s[i]) { + i++; + } + return i; } -ssize_t write (int fd, const void *buf, size_t count) { - register unsigned int callno asm ("r9") = 4; /* NR_write */ - register unsigned int r10 asm ("r10") = fd; - register const void *r11 asm ("r11") = buf; - register size_t r12 asm ("r12") = count; - register unsigned int r asm ("r10"); - asm volatile ("break 13\n" - : "=r" (r) - : "r" (callno), "0" (r10), "r" (r11), "r" (r12) - : "memory"); +void pass(void) +{ + char s[] = "passed.\n"; + write(1, s, sizeof(s) - 1); + exit(0); +} - return r; +void _fail(char *reason) +{ + char s[] = "\nfailed: "; + int len = mystrlen(reason); + write(1, s, sizeof(s) - 1); + write(1, reason, len); + write(1, "\n", 1); + exit(1); }