From patchwork Thu Oct 10 08:41:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 20930 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f69.google.com (mail-pb0-f69.google.com [209.85.160.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 184402611D for ; Thu, 10 Oct 2013 08:41:34 +0000 (UTC) Received: by mail-pb0-f69.google.com with SMTP id md4sf3636263pbc.0 for ; Thu, 10 Oct 2013 01:41:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=vFwovETJVydoOxDcJS4AoTJk78S+KJB2mE4MW8zBFrE=; b=XWi1jiyQxSTF7aGMRJ3bj+99usk8H+g/ALlqynNx11F4NphQilaOD+AO+qVwUnWSZ/ 076LDGLwNrUbVCRIbwUEndRzm1Qp6etprQRhJRC3armrzTXHnJl9ylmZgepUedfKDwwZ 2eRmNPFE1/LjLRRNxDvJGMn1pe2GyKZX1ZvdNV8V8Jp9Bd6uMVVk6o+hu8vkjZbu17Au b+NTVH1m+eK/wluYkj5atrXGrPTLz4I/m7waSI7uAW7ZAVVnRG5VyQmDh3a3upv1oPTm nXVxU1f9agNK9WBXbABrExF8LovvveZZINQYMxS352Vlgu44DY+nzUw2wUwiMPW5Ll53 kL7A== X-Received: by 10.66.252.170 with SMTP id zt10mr3953998pac.34.1381394493841; Thu, 10 Oct 2013 01:41:33 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.35.170 with SMTP id i10ls870208qej.74.gmail; Thu, 10 Oct 2013 01:41:33 -0700 (PDT) X-Received: by 10.52.108.161 with SMTP id hl1mr4042222vdb.62.1381394493635; Thu, 10 Oct 2013 01:41:33 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id dt10si13767265vdb.34.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Oct 2013 01:41:33 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id gd11so1376252vcb.19 for ; Thu, 10 Oct 2013 01:41:33 -0700 (PDT) X-Gm-Message-State: ALoCoQlyDVMkr1eUhRHnrTVS/JahMaOm9tijmOO4MkT7qCwaOPXNPDtMRDl5Bf/Rb8NZij6DwncT X-Received: by 10.52.122.15 with SMTP id lo15mr3912091vdb.115.1381394493514; Thu, 10 Oct 2013 01:41:33 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp357345vcz; Thu, 10 Oct 2013 01:41:32 -0700 (PDT) X-Received: by 10.152.203.233 with SMTP id kt9mr10370893lac.29.1381394492044; Thu, 10 Oct 2013 01:41:32 -0700 (PDT) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com [209.85.217.169]) by mx.google.com with ESMTPS id y5si19434319lbb.147.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Oct 2013 01:41:32 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.217.169 is neither permitted nor denied by best guess record for domain of anders.roxell@linaro.org) client-ip=209.85.217.169; Received: by mail-lb0-f169.google.com with SMTP id z5so1864592lbh.28 for ; Thu, 10 Oct 2013 01:41:31 -0700 (PDT) X-Received: by 10.112.130.168 with SMTP id of8mr342025lbb.46.1381394491287; Thu, 10 Oct 2013 01:41:31 -0700 (PDT) Received: from localhost (c-853670d5.07-21-73746f28.cust.bredbandsbolaget.se. [213.112.54.133]) by mx.google.com with ESMTPSA id pw4sm29052148lbb.9.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 10 Oct 2013 01:41:30 -0700 (PDT) From: Anders Roxell To: davej@redhat.com Cc: trinity@vger.kernel.org, patches@linaro.org, Anders Roxell Subject: [PATCHv2 3/3] tables.c: change the output format of -L Date: Thu, 10 Oct 2013 10:41:15 +0200 Message-Id: <1381394475-24803-1-git-send-email-anders.roxell@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1381316186-8562-1-git-send-email-anders.roxell@linaro.org> References: <1381316186-8562-1-git-send-email-anders.roxell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: anders.roxell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , So the scripts can works for both biarch and !biarch Signed-off-by: Anders Roxell --- scripts/find.sh | 2 +- scripts/test-all-syscalls-parallel.sh | 2 +- scripts/test-all-syscalls-sequentially.sh | 2 +- tables.c | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/find.sh b/scripts/find.sh index 3f10c58..4c970c1 100755 --- a/scripts/find.sh +++ b/scripts/find.sh @@ -27,7 +27,7 @@ while [ 1 ]; do -for sc in $($TRINITY_PATH/trinity -L | grep entrypoint | grep -v AVOID | awk '{ print $4 }' | sort -u) +for sc in $($TRINITY_PATH/trinity -L | grep entrypoint | grep -v AVOID | awk '{ print $3 }' | sort -u) do mkdir -p tmp.$i pushd tmp.$i diff --git a/scripts/test-all-syscalls-parallel.sh b/scripts/test-all-syscalls-parallel.sh index 312fd2a..7206364 100755 --- a/scripts/test-all-syscalls-parallel.sh +++ b/scripts/test-all-syscalls-parallel.sh @@ -8,7 +8,7 @@ cd $TRINITY_TMP while [ 1 ]; do - for syscall in $($TRINITY_PATH/trinity -L | grep entrypoint | grep -v AVOID | awk '{ print $4 }' | sort -u) + for syscall in $($TRINITY_PATH/trinity -L | grep entrypoint | grep -v AVOID | awk '{ print $3 }' | sort -u) do MALLOC_CHECK_=2 $TRINITY_PATH/trinity -q -c $syscall -D & done diff --git a/scripts/test-all-syscalls-sequentially.sh b/scripts/test-all-syscalls-sequentially.sh index 2b726fc..14fb4c3 100755 --- a/scripts/test-all-syscalls-sequentially.sh +++ b/scripts/test-all-syscalls-sequentially.sh @@ -18,7 +18,7 @@ TAINT=$(cat /proc/sys/kernel/tainted) while [ 1 ] do -for syscall in $($TRINITY_PATH/trinity -L | grep entrypoint | grep -v AVOID | awk '{ print $4 }' | sort -u) +for syscall in $($TRINITY_PATH/trinity -L | grep entrypoint | grep -v AVOID | awk '{ print $3 }' | sort -u) do chmod 755 $TRINITY_TMP pushd $TRINITY_TMP diff --git a/tables.c b/tables.c index 618d742..b5c06fa 100644 --- a/tables.c +++ b/tables.c @@ -527,18 +527,18 @@ void dump_syscall_tables(void) unsigned int i; if (biarch == TRUE) { - printf("32-bit syscalls: %d\n", max_nr_32bit_syscalls); - printf("64-bit syscalls: %d\n", max_nr_64bit_syscalls); + printf("syscalls: %d [32-bit] \n", max_nr_32bit_syscalls); + printf("syscalls: %d [64-bit] \n", max_nr_64bit_syscalls); for_each_32bit_syscall(i) { - printf("32-bit entrypoint %d %s : ", syscalls_32bit[i].entry->number, syscalls_32bit[i].entry->name); + printf("entrypoint %d %s : [32-bit] ", syscalls_32bit[i].entry->number, syscalls_32bit[i].entry->name); show_state(syscalls_32bit[i].entry->flags & ACTIVE); if (syscalls_32bit[i].entry->flags & AVOID_SYSCALL) printf(" AVOID"); printf("\n"); } for_each_64bit_syscall(i) { - printf("64-bit entrypoint %d %s : ", syscalls_64bit[i].entry->number, syscalls_64bit[i].entry->name); + printf("entrypoint %d %s : [64-bit] ", syscalls_64bit[i].entry->number, syscalls_64bit[i].entry->name); show_state(syscalls_64bit[i].entry->flags & ACTIVE); if (syscalls_64bit[i].entry->flags & AVOID_SYSCALL) printf(" AVOID"); @@ -547,7 +547,7 @@ void dump_syscall_tables(void) } else { printf("syscalls: %d\n", max_nr_syscalls); for_each_syscall(i) { - printf("%d %s : ", syscalls[i].entry->number, syscalls[i].entry->name); + printf("entrypoint %d %s : ", syscalls[i].entry->number, syscalls[i].entry->name); show_state(syscalls[i].entry->flags & ACTIVE); if (syscalls[i].entry->flags & AVOID_SYSCALL) printf(" AVOID");