From nobody Mon Apr 29 11:34:11 2024 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=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554748202457386.1925950606807; Mon, 8 Apr 2019 11:30:02 -0700 (PDT) Received: from localhost ([127.0.0.1]:57109 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDZ1n-0008Tq-Lf for importer@patchew.org; Mon, 08 Apr 2019 14:29:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDZ0L-0007Zk-03 for qemu-devel@nongnu.org; Mon, 08 Apr 2019 14:28:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDZ0J-0007Ap-ME for qemu-devel@nongnu.org; Mon, 08 Apr 2019 14:28:24 -0400 Received: from mail-oi1-x242.google.com ([2607:f8b0:4864:20::242]:33325) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDZ0J-0007A3-BJ for qemu-devel@nongnu.org; Mon, 08 Apr 2019 14:28:23 -0400 Received: by mail-oi1-x242.google.com with SMTP id e5so11346717oii.0 for ; Mon, 08 Apr 2019 11:28:23 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id r133sm9940295oib.21.2019.04.08.11.28.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Apr 2019 11:28:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r88vxrdOANtSevF0RS6MjJXOTKwB4PzxdUtRxh2hHc4=; b=KWizA0gKhRZJH9ebhRvLM8VnTJ3VjrSol+jK/hvlam4DLt1ZJeO0ld1hRrxPSU7q/9 vAsGF5WZVexdbPcgpgrPPeSHZ+X00u7Xp9BJ5g9T1N6hBBR07m7+rgq3rX2AlO4Q7Y8Y 770rmR4V1FRTrDBBDHUtUpBgBIJJKUhWsgu6YpzmoBOgJLZx6Of8RQ2Lp9Joft18M8Yn 7h4B1opk19CaABgT9snDkzylPdo07w9MULeZLt0nCu6U5xwrTy8K0HTmV7J5DyQV2ejZ Vqu+38KLQqv1//hkeNoDq07hnhXhTNtnPI+wSs8lzL91seTPZhAM07fOuDK/6Ov1oaiL M55A== 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=r88vxrdOANtSevF0RS6MjJXOTKwB4PzxdUtRxh2hHc4=; b=kkXUNDM516FER7VEdeKfTWEgWgKTMyiTVRV1Gc0y2cE5+IdYa7B+tXDYBs8A+rPEAE tYjgyj+pKL2zKl/a8WLnUF+A8b0V6eDKVI9VIamYogRvbAysFkLQjrohrYYpCRzFq28z oxPjfTwkXkjYyQvp5+/tQD2zX/Qny0EhDESBR8JNP4hoETX6v2RCR1u5bAPzQh562DiU NuxmhpYWL2EaS9LhktMdsx6L7/MS6r0c5Mj2LE0h1FD5W5n05FPZ6AXk6ZbXFROFwqyI FsZbfQO16Q3r5yKINpupiQMJCG7mhtxkgHuEBMAUL0YqAAMfpIosHOOkcnsZtzSeaj0s wPPg== X-Gm-Message-State: APjAAAXAQABXQVQFmXT6MPfcNskCbIaAn3MwvK4DKgcVYVO3djL/JWag RktMPkrUfnW/igC6XFQOg8XtUeoRGsI= X-Google-Smtp-Source: APXvYqybR4tM/zFGkQIT5Q3q8gD7Mv7TZKlHc4ZWZxJMPJ3nfiVm23Xh2yZRKdMxpQ7rL7FIAtZx5A== X-Received: by 2002:aca:3306:: with SMTP id z6mr17287864oiz.25.1554748102133; Mon, 08 Apr 2019 11:28:22 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Mon, 8 Apr 2019 14:27:44 -0400 Message-Id: <20190408182748.1238-2-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190408182748.1238-1-jan.bobek@gmail.com> References: <20190408182748.1238-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::242 Subject: [Qemu-devel] [RISU PATCH 1/5] risu_i386: move reginfo_t and related defines to risu_reginfo_i386.h 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=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek , Stefan Hajnoczi , Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" In order to build risu successfully for i386, we need files risu_reginfo_i386.{h,c}; this patch adds the former by extracting the relevant code from risu_i386.c. This patch is pure code motion; no functional changes were made. Signed-off-by: Jan Bobek Reviewed-by: Alex Benn=C3=A9e --- risu_i386.c | 23 +---------------------- risu_reginfo_i386.h | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 22 deletions(-) create mode 100644 risu_reginfo_i386.h diff --git a/risu_i386.c b/risu_i386.c index 5e7e01d..6798a78 100644 --- a/risu_i386.c +++ b/risu_i386.c @@ -14,28 +14,7 @@ #include =20 #include "risu.h" - -/* This is the data structure we pass over the socket. - * It is a simplified and reduced subset of what can - * be obtained with a ucontext_t* - */ -struct reginfo { - uint32_t faulting_insn; - gregset_t gregs; -}; - -#ifndef REG_GS -/* Assume that either we get all these defines or none */ -#define REG_GS 0 -#define REG_FS 1 -#define REG_ES 2 -#define REG_DS 3 -#define REG_ESP 7 -#define REG_TRAPNO 12 -#define REG_EIP 14 -#define REG_EFL 16 -#define REG_UESP 17 -#endif +#include "risu_reginfo_i386.h" =20 struct reginfo master_ri, apprentice_ri; =20 diff --git a/risu_reginfo_i386.h b/risu_reginfo_i386.h new file mode 100644 index 0000000..5bba439 --- /dev/null +++ b/risu_reginfo_i386.h @@ -0,0 +1,37 @@ +/*************************************************************************= ****** + * Copyright (c) 2010 Linaro Limited + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Peter Maydell (Linaro) - initial implementation + *************************************************************************= *****/ + +#ifndef RISU_REGINFO_I386_H +#define RISU_REGINFO_I386_H + +/* This is the data structure we pass over the socket. + * It is a simplified and reduced subset of what can + * be obtained with a ucontext_t* + */ +struct reginfo { + uint32_t faulting_insn; + gregset_t gregs; +}; + +#ifndef REG_GS +/* Assume that either we get all these defines or none */ +# define REG_GS 0 +# define REG_FS 1 +# define REG_ES 2 +# define REG_DS 3 +# define REG_ESP 7 +# define REG_TRAPNO 12 +# define REG_EIP 14 +# define REG_EFL 16 +# define REG_UESP 17 +#endif /* !defined(REG_GS) */ + +#endif /* RISU_REGINFO_I386_H */ --=20 2.20.1 From nobody Mon Apr 29 11:34:11 2024 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=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554748301617984.6823927910266; Mon, 8 Apr 2019 11:31:41 -0700 (PDT) Received: from localhost ([127.0.0.1]:57155 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDZ3P-0001Ir-KL for importer@patchew.org; Mon, 08 Apr 2019 14:31:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58359) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDZ0M-0007Zv-It for qemu-devel@nongnu.org; Mon, 08 Apr 2019 14:28:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDZ0K-0007BU-Kk for qemu-devel@nongnu.org; Mon, 08 Apr 2019 14:28:26 -0400 Received: from mail-oi1-x22c.google.com ([2607:f8b0:4864:20::22c]:41805) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDZ0K-0007B1-Cm for qemu-devel@nongnu.org; Mon, 08 Apr 2019 14:28:24 -0400 Received: by mail-oi1-x22c.google.com with SMTP id v7so11304808oie.8 for ; Mon, 08 Apr 2019 11:28:24 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id r133sm9940295oib.21.2019.04.08.11.28.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Apr 2019 11:28:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZZX//Rv+ayyPhWmMCWfxTWkZjELBsgYzluMsiNdCjJI=; b=cf5DZK8urg91rpQk9z3hQbVqJlnjvlM2+fTRHJd2mryWj1M4izBQ9tXA5fmijk8Dna j3PkNN8KRfknwKTe5NHNKsnjsZEtM4ypmGq5Vq2geq7TXKn94uvHVriJBTcPqTbap0yY HGyEMHWIeVbtOQeKP6zj8re3B2K8l6X/G6g7rm+V0a9rEv785ePe2HXey1c07KdnVrZ7 cMzWGdXk1tn6MOit2O1B3CiBn5XgXLOBciD1kIvOjL3vrDn7N1uUkUP2GUWVLH9T86wU d7yChCtSM1jGxBVbvdN+Z9k+blHAlFZlntuOGnlP0h1fsQvclTlL5Zgxeh/CHCfvMSAr b27Q== 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=ZZX//Rv+ayyPhWmMCWfxTWkZjELBsgYzluMsiNdCjJI=; b=BKs23AdH6R3M4LJSesSeG63g7RlnYfXEB/mgLufqSXV52NfsE0mDPkJKd5oNrDgEC3 qDmbnQAIxQcHODLJUBwDWq/HHDFX6hSKEH3kTkvAm6bPE/EWou9OI/eKDHX5ZuP9i4k1 y3VqA/gYPehmVbUsxr2r+JpdexmqXTQ8wp2W654WIrB/cHgq+6EzbrG8ksfY8Fzwpm+P 6KPW7IOofQvIYeMWBwPMRjw2redvEjTY2BVQUb93cZ8/4ujm+zkDWa+rVJH4N4C1YKDw 6xLgTHMQa5C9EM0rtet8uRIUs9glvCs6CdBG4HU2TkTs3nHuiIA+oEr2zeTP92p3+HSP wDug== X-Gm-Message-State: APjAAAXUPiR/TczVni//TsNs/gedbXBC54cSrT7wT6HfUHWCfkDDz4fw UMO38chYQ1Qr0quqVNf3JCuwVuF4108= X-Google-Smtp-Source: APXvYqzYnv4D2Vtva/Gvum0qbcCYA8A/L4Ira3kiAz0cKrMMdjW2WSZZp1C3uD9lTVDgPx/aptgdkw== X-Received: by 2002:aca:407:: with SMTP id 7mr16289515oie.90.1554748103343; Mon, 08 Apr 2019 11:28:23 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Mon, 8 Apr 2019 14:27:45 -0400 Message-Id: <20190408182748.1238-3-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190408182748.1238-1-jan.bobek@gmail.com> References: <20190408182748.1238-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::22c Subject: [Qemu-devel] [RISU PATCH 2/5] risu_i386: move reginfo-related code to risu_reginfo_i386.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=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek , Stefan Hajnoczi , Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" In order to build risu successfully for i386, we need files risu_reginfo_i386.{h,c}; this patch adds the latter by extracting the relevant code from risu_i386.c. This patch is pure code motion; no functional changes were made. Signed-off-by: Jan Bobek Reviewed-by: Alex Benn=C3=A9e --- risu_i386.c | 54 ----------------------------------- risu_reginfo_i386.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 54 deletions(-) create mode 100644 risu_reginfo_i386.c diff --git a/risu_i386.c b/risu_i386.c index 6798a78..2d2f325 100644 --- a/risu_i386.c +++ b/risu_i386.c @@ -33,43 +33,6 @@ void advance_pc(void *vuc) uc->uc_mcontext.gregs[REG_EIP] +=3D 2; } =20 -static void fill_reginfo(struct reginfo *ri, ucontext_t * uc) -{ - int i; - for (i =3D 0; i < NGREG; i++) { - switch (i) { - case REG_ESP: - case REG_UESP: - case REG_GS: - case REG_FS: - case REG_ES: - case REG_DS: - case REG_TRAPNO: - case REG_EFL: - /* Don't store these registers as it results in mismatches. - * In particular valgrind has different values for some - * segment registers, and they're boring anyway. - * We really shouldn't be ignoring EFL but valgrind doesn't - * seem to set it right and I don't care to investigate. - */ - ri->gregs[i] =3D 0xDEADBEEF; - break; - case REG_EIP: - /* Store the offset from the start of the test image */ - ri->gregs[i] =3D uc->uc_mcontext.gregs[i] - image_start_addres= s; - break; - default: - ri->gregs[i] =3D uc->uc_mcontext.gregs[i]; - break; - } - } - /* x86 insns aren't 32 bit but we're not really testing x86 so - * this is just to distinguish 'do compare' from 'stop' - */ - ri->faulting_insn =3D *((uint32_t *) uc->uc_mcontext.gregs[REG_EIP]); -} - - int send_register_info(int sock, void *uc) { struct reginfo ri; @@ -100,23 +63,6 @@ int recv_and_compare_register_info(int sock, void *uc) return resp; } =20 -static char *regname[] =3D { - "GS", "FS", "ES", "DS", "EDI", "ESI", "EBP", "ESP", - "EBX", "EDX", "ECX", "EAX", "TRAPNO", "ERR", "EIP", - "CS", "EFL", "UESP", "SS", 0 -}; - -static void dump_reginfo(struct reginfo *ri) -{ - int i; - fprintf(stderr, " faulting insn %x\n", ri->faulting_insn); - for (i =3D 0; i < NGREG; i++) { - fprintf(stderr, " %s: %x\n", regname[i] ? regname[i] : "???", - ri->gregs[i]); - } -} - - /* Print a useful report on the status of the last comparison * done in recv_and_compare_register_info(). This is called on * exit, so need not restrict itself to signal-safe functions. diff --git a/risu_reginfo_i386.c b/risu_reginfo_i386.c new file mode 100644 index 0000000..e8d671f --- /dev/null +++ b/risu_reginfo_i386.c @@ -0,0 +1,68 @@ +/*************************************************************************= ****** + * Copyright (c) 2010 Linaro Limited + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Peter Maydell (Linaro) - initial implementation + *************************************************************************= *****/ + +#include +#include + +#include "risu.h" +#include "risu_reginfo_i386.h" + +static void fill_reginfo(struct reginfo *ri, ucontext_t * uc) +{ + int i; + for (i =3D 0; i < NGREG; i++) { + switch (i) { + case REG_ESP: + case REG_UESP: + case REG_GS: + case REG_FS: + case REG_ES: + case REG_DS: + case REG_TRAPNO: + case REG_EFL: + /* Don't store these registers as it results in mismatches. + * In particular valgrind has different values for some + * segment registers, and they're boring anyway. + * We really shouldn't be ignoring EFL but valgrind doesn't + * seem to set it right and I don't care to investigate. + */ + ri->gregs[i] =3D 0xDEADBEEF; + break; + case REG_EIP: + /* Store the offset from the start of the test image */ + ri->gregs[i] =3D uc->uc_mcontext.gregs[i] - image_start_addres= s; + break; + default: + ri->gregs[i] =3D uc->uc_mcontext.gregs[i]; + break; + } + } + /* x86 insns aren't 32 bit but we're not really testing x86 so + * this is just to distinguish 'do compare' from 'stop' + */ + ri->faulting_insn =3D *((uint32_t *) uc->uc_mcontext.gregs[REG_EIP]); +} + +static char *regname[] =3D { + "GS", "FS", "ES", "DS", "EDI", "ESI", "EBP", "ESP", + "EBX", "EDX", "ECX", "EAX", "TRAPNO", "ERR", "EIP", + "CS", "EFL", "UESP", "SS", 0 +}; + +static void dump_reginfo(struct reginfo *ri) +{ + int i; + fprintf(stderr, " faulting insn %x\n", ri->faulting_insn); + for (i =3D 0; i < NGREG; i++) { + fprintf(stderr, " %s: %x\n", regname[i] ? regname[i] : "???", + ri->gregs[i]); + } +} --=20 2.20.1 From nobody Mon Apr 29 11:34:11 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 155474820133821.173898200583608; Mon, 8 Apr 2019 11:30:01 -0700 (PDT) Received: from localhost ([127.0.0.1]:57107 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDZ1n-0008Tb-Al for importer@patchew.org; Mon, 08 Apr 2019 14:29:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDZ0M-0007Zw-Gk for qemu-devel@nongnu.org; Mon, 08 Apr 2019 14:28:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDZ0L-0007Co-Dv for qemu-devel@nongnu.org; Mon, 08 Apr 2019 14:28:26 -0400 Received: from mail-ot1-x344.google.com ([2607:f8b0:4864:20::344]:41957) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDZ0L-0007Bq-66 for qemu-devel@nongnu.org; Mon, 08 Apr 2019 14:28:25 -0400 Received: by mail-ot1-x344.google.com with SMTP id 64so13099362otb.8 for ; Mon, 08 Apr 2019 11:28:25 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id r133sm9940295oib.21.2019.04.08.11.28.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Apr 2019 11:28:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8Ez4tXIquMxDTRtR9gb1w7DfYhokfkOQYjP9oOimxak=; b=WSahZhykbkLllzQoHV6Jk8IBQKSob2ZSN+e5HR+Keu0Q1fdHUJa3OaCSFm3lrmiKmn qLUqHMnwMkytB/+AYeremnLwlreiIiNjM6GLE9ph47aZQsefilUGn57XTGKrXNfxnxBz VwUVWs4ihgiXUUFN3vFareSCVMlMAlweUHOKJvyqFLjQ4L9G+7aYnTwBA44+jH6DoIBc SZGYMKIG6Ng1fDieN42LhsIcLRXzWzQBVbEorDMm3w2UpNSUOxQ1LjtEb4We5xpa/8CS 97c5DQ9cWZXWvdr9tm/DfHJYp9rTokFRucW8fCMAH00EsRTxkHz7ZwcQsE6OVwXWgBw2 rpbg== 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=8Ez4tXIquMxDTRtR9gb1w7DfYhokfkOQYjP9oOimxak=; b=BWh12WaPfk6wSn+YXuKFP/EoYmPzj5azjEbjJICAvAlhSVDLUMlteSiJk6XGXNoFXv hpYiDYzweqw7y7bna73eMw6dQoQAwA9at4sEpG7M8PIIrCj2q7oOfOlKZ3K7nByTpucV gkTAH3BDsWm3Czke0NEwnMnTzk84KbAYuCjkT7+08lR33jXVzavCJWY5dNnnLgGUcRri 25mcXzfnCuMy6oypnsW8wV5uGTFOfIrcZxhWnEhIB/ZlZMo7uWZbUoKr3U9ZPzJBEH9I oUJ1JSQ8SUT5/59MoyVsqtRnzqFNvdxnJa8u5+PsGwukLrGltagNG9qT1M+v9R/1EKoe cDVw== X-Gm-Message-State: APjAAAX+WsWB8jOVosXM+5RPr9oWGisx4FBWYkh2jDEkYo7J/QPu5mjL xT3mfrs/PjljJn3cz1RQ0J3wi9jEpZU= X-Google-Smtp-Source: APXvYqxsDrBXNpiymB4ioDRr2Vv9KkFJXZxgTfaKIaW/4/NoFAH8hJDm93zYzpApcyL6gowfyEazuA== X-Received: by 2002:a05:6830:7:: with SMTP id c7mr19067062otp.85.1554748104286; Mon, 08 Apr 2019 11:28:24 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Mon, 8 Apr 2019 14:27:46 -0400 Message-Id: <20190408182748.1238-4-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190408182748.1238-1-jan.bobek@gmail.com> References: <20190408182748.1238-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::344 Subject: [Qemu-devel] [RISU PATCH 3/5] risu_reginfo_i386: implement arch-specific reginfo interface 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=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek , Stefan Hajnoczi , Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" CPU-specific code in risu_reginfo_* is expected to define and export the following symbols: - arch_long_opts, arch_extra_help, process_arch_opt - reginfo_size - reginfo_init - reginfo_is_eq - reginfo_dump, reginfo_dump_mismatch Make risu_reginfo_i386.c implement this interface. Signed-off-by: Jan Bobek Reviewed-by: Alex Benn=C3=A9e --- risu_reginfo_i386.c | 48 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/risu_reginfo_i386.c b/risu_reginfo_i386.c index e8d671f..3882261 100644 --- a/risu_reginfo_i386.c +++ b/risu_reginfo_i386.c @@ -10,12 +10,28 @@ *************************************************************************= *****/ =20 #include +#include +#include #include =20 #include "risu.h" #include "risu_reginfo_i386.h" =20 -static void fill_reginfo(struct reginfo *ri, ucontext_t * uc) +const struct option * const arch_long_opts; +const char * const arch_extra_help; + +void process_arch_opt(int opt, const char *arg) +{ + abort(); +} + +const int reginfo_size(void) +{ + return sizeof(struct reginfo); +} + +/* reginfo_init: initialize with a ucontext */ +void reginfo_init(struct reginfo *ri, ucontext_t *uc) { int i; for (i =3D 0; i < NGREG; i++) { @@ -51,18 +67,38 @@ static void fill_reginfo(struct reginfo *ri, ucontext_t= * uc) ri->faulting_insn =3D *((uint32_t *) uc->uc_mcontext.gregs[REG_EIP]); } =20 -static char *regname[] =3D { +/* reginfo_is_eq: compare the reginfo structs, returns nonzero if equal */ +int reginfo_is_eq(struct reginfo *m, struct reginfo *a) +{ + return 0 =3D=3D memcmp(m, a, sizeof(*m)); +} + +static const char *const regname[NGREG] =3D { "GS", "FS", "ES", "DS", "EDI", "ESI", "EBP", "ESP", "EBX", "EDX", "ECX", "EAX", "TRAPNO", "ERR", "EIP", - "CS", "EFL", "UESP", "SS", 0 + "CS", "EFL", "UESP", "SS" }; =20 -static void dump_reginfo(struct reginfo *ri) +/* reginfo_dump: print state to a stream, returns nonzero on success */ +int reginfo_dump(struct reginfo *ri, FILE *f) { int i; - fprintf(stderr, " faulting insn %x\n", ri->faulting_insn); + fprintf(f, " faulting insn %x\n", ri->faulting_insn); for (i =3D 0; i < NGREG; i++) { - fprintf(stderr, " %s: %x\n", regname[i] ? regname[i] : "???", + fprintf(f, " %s: %x\n", regname[i] ? regname[i] : "???", ri->gregs[i]); } + return !ferror(f); +} + +int reginfo_dump_mismatch(struct reginfo *m, struct reginfo *a, FILE *f) +{ + int i; + for (i =3D 0; i < NGREG; i++) { + if (m->gregs[i] !=3D a->gregs[i]) { + fprintf(f, "Mismatch: Register %s\n", regname[i] ? regname[i] = : "???"); + fprintf(f, "m: [%x] !=3D a: [%x]\n", m->gregs[i], a->gregs[i]); + } + } + return !ferror(f); } --=20 2.20.1 From nobody Mon Apr 29 11:34:11 2024 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=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554748385003747.5514851453894; Mon, 8 Apr 2019 11:33:05 -0700 (PDT) Received: from localhost ([127.0.0.1]:57161 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDZ4l-0001w0-1y for importer@patchew.org; Mon, 08 Apr 2019 14:32:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58377) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDZ0N-0007ae-Go for qemu-devel@nongnu.org; Mon, 08 Apr 2019 14:28:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDZ0M-0007DX-KK for qemu-devel@nongnu.org; Mon, 08 Apr 2019 14:28:27 -0400 Received: from mail-ot1-x341.google.com ([2607:f8b0:4864:20::341]:32918) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDZ0M-0007D7-Cg for qemu-devel@nongnu.org; Mon, 08 Apr 2019 14:28:26 -0400 Received: by mail-ot1-x341.google.com with SMTP id j10so13142277otq.0 for ; Mon, 08 Apr 2019 11:28:26 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id r133sm9940295oib.21.2019.04.08.11.28.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Apr 2019 11:28:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hFh8u7VvLXZSxRQAF9IApVSzIxy5BTFFlRPFEY6766Q=; b=j2zgZNrJlHa2nIbsiesz4uo4KQAb+QUYqFHwtk1HMIuLs9ILgjpjNbLyqYg/HuYd1v QGo97y3K022rU6SIiJVvjrrCFc6RYqcuKSY4nGmyPXtbJCCuoTm7/Q4Ei3ZdYGTTmB5+ RMvt3Cnb0q/VhxAfhwv/a+uek4k9w+LDZ93O3PPjSRXY+4VWgRGBPQdes2xf9aaPiX49 OXsaggJ4IIAgy+Tod1x2dYxMDJeMOoDS4UDQrcQ6zNBo4dWrBMSooK5MhByv+dJO04GD XfMoW5eb0zpkp7gB5w5VXlviSfrkWidrFCpjQmes9V02K2TvZbkmY/dymZIdNhPu7QCD rT7Q== 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=hFh8u7VvLXZSxRQAF9IApVSzIxy5BTFFlRPFEY6766Q=; b=R2c92jz66Sawl4CwxYWtaqgldBNJZDyk4ZgUlX6i9J6cjmlZFxzGF/8YgJe+WjOK/k siLkg2WvpNiwY0y+YL6ZfPOWmsHLUml2NY8TfaBVUOgG5uV0nL1c31SUk/jWgwkgeFKy 8rBYajzTzVnOrJFrNZjcTg/HJvRC4bUuUeE8RLVn2VFHw26M8oPJ9DdBcMEzjzoUZ8Ch NyCcy3yGaHCXbeUfPgY/Cnj8X8yV6GuC2OoDj8O8x8kB9xSYCaDY/GegEkNUGUhVhPIn NmPBN6HaVn/XvPNC1BeVLmPmOUKiFAbKE6ip9fv1C5EvNzo4gFXa8lBnCtEud46Za4YT Brmw== X-Gm-Message-State: APjAAAXnT+sYjDmvSDP3EwaKsx7IVi7Y6bHz3aN6jclVJNeMSTL+9FX8 UaqgaIq/+WLqDfxwuJ1Mcr7uyu6H2pQ= X-Google-Smtp-Source: APXvYqxlEaT5PmbwoBjtrcCuTPk4xqy081eOeU8wcNuuXas+J+s8zuKEpRvc4a6jVrA9RtiagZbOlg== X-Received: by 2002:a05:6830:2144:: with SMTP id r4mr20673494otd.250.1554748105538; Mon, 08 Apr 2019 11:28:25 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Mon, 8 Apr 2019 14:27:47 -0400 Message-Id: <20190408182748.1238-5-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190408182748.1238-1-jan.bobek@gmail.com> References: <20190408182748.1238-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::341 Subject: [Qemu-devel] [RISU PATCH 4/5] risu_i386: implement missing CPU-specific functions 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=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek , Stefan Hajnoczi , Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" risu_i386.c is expected to implement the following functions: - advance_pc - get_reginfo_paramreg, set_ucontext_paramreg - get_risuop - get_pc This patch adds the necessary code. (We use EAX as the parameter register.) Signed-off-by: Jan Bobek --- risu_i386.c | 31 ++++++++++++++++++++++++++++++- risu_reginfo_i386.h | 1 + 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/risu_i386.c b/risu_i386.c index 2d2f325..eb4dff4 100644 --- a/risu_i386.c +++ b/risu_i386.c @@ -25,14 +25,43 @@ static int insn_is_ud2(uint32_t insn) =20 void advance_pc(void *vuc) { + ucontext_t *uc =3D (ucontext_t *) vuc; + /* We assume that this is either UD1 or UD2. * This would need tweaking if we want to test * expected undefs on x86. */ - ucontext_t *uc =3D vuc; uc->uc_mcontext.gregs[REG_EIP] +=3D 2; } =20 +void set_ucontext_paramreg(void *vuc, uint64_t value) +{ + ucontext_t *uc =3D (ucontext_t *) vuc; + uc->uc_mcontext.gregs[REG_EAX] =3D (uint32_t) value; +} + +uint64_t get_reginfo_paramreg(struct reginfo *ri) +{ + return ri->gregs[REG_EAX]; +} + +int get_risuop(struct reginfo *ri) +{ + switch (ri->faulting_insn & 0xffff) { + case 0xb90f: /* UD1 */ + return OP_COMPARE; + case 0x0b0f: /* UD2 */ + return OP_TESTEND; + default: /* unexpected */ + return -1; + } +} + +uintptr_t get_pc(struct reginfo *ri) +{ + return ri->gregs[REG_EIP]; +} + int send_register_info(int sock, void *uc) { struct reginfo ri; diff --git a/risu_reginfo_i386.h b/risu_reginfo_i386.h index 5bba439..4ad90e1 100644 --- a/risu_reginfo_i386.h +++ b/risu_reginfo_i386.h @@ -28,6 +28,7 @@ struct reginfo { # define REG_ES 2 # define REG_DS 3 # define REG_ESP 7 +# define REG_EAX 11 # define REG_TRAPNO 12 # define REG_EIP 14 # define REG_EFL 16 --=20 2.20.1 From nobody Mon Apr 29 11:34:11 2024 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=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 155474851502912.998080934244399; Mon, 8 Apr 2019 11:35:15 -0700 (PDT) Received: from localhost ([127.0.0.1]:57173 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDZ6t-000372-IB for importer@patchew.org; Mon, 08 Apr 2019 14:35:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDZ0O-0007bf-Dl for qemu-devel@nongnu.org; Mon, 08 Apr 2019 14:28:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDZ0N-0007Dy-Ei for qemu-devel@nongnu.org; Mon, 08 Apr 2019 14:28:28 -0400 Received: from mail-ot1-x344.google.com ([2607:f8b0:4864:20::344]:38591) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDZ0N-0007Di-8Y for qemu-devel@nongnu.org; Mon, 08 Apr 2019 14:28:27 -0400 Received: by mail-ot1-x344.google.com with SMTP id e80so13118371ote.5 for ; Mon, 08 Apr 2019 11:28:27 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id r133sm9940295oib.21.2019.04.08.11.28.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Apr 2019 11:28:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ixDla5yG69dYcjSXMRxEhIxmDIvMKdt+9KxqZIdYFH4=; b=Xp4EM/1caaJyewiCheEs/t0w9jLBDYYz1KpnwuUi7COJoSo6d5vhNfyktZ+vyf2Os8 txfqcUuLTnXfIlabXWdTZHzqPKfmnaEVVFRp8hMb3OFV8AXZtNgRGivhvPGq7gPOo8ZA 9Pk0IBNf1MoaBymu8S909cePYlv6Mkjme+K4YQfIt9cJX7f8dBFi43WPl3XCLUIUV3ZH QI5YDjE62XgBm1i6razzZzZhuKLFScrhDElpkOb9PAKrItVx6jw6lu5+a4RJDz7O1cgp jArjcfd4lPSqIe356woYgGjk4qdkbXKDXAwEju11JDEqY+5XNTzoeVPad4EO2vvfkdZH FK+A== 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=ixDla5yG69dYcjSXMRxEhIxmDIvMKdt+9KxqZIdYFH4=; b=J2eV6XUblhvt85bOaxIeQgC3iJHO4sW5WDpjC0duisXr+3o4CeByPavc5vencoVLUB OxzqPMZYgpwGBmt1GAzWRulqKDNhqK1abaOIy6KQWXsZPC8axLrvIBK704tm2WQXpVQp 7r+DO9unyChBAgQQ2uGaethWng6doIT1SWBkJ23Gy3KZtdsZiLYm2jqFl7quJCNrPry3 9D++J/e+5lJ3EyIKdhVXRBHQsYvndCT83Z0c08ZM1Gls2DwTDvItBEkHgHCqL4tSfZB1 kuEI1FKcsseIcUKMUXHCa8oT73MX1vK+BtsXdkgz0btAeep67BbaK6++RGAQRgimlOZ9 JT4w== X-Gm-Message-State: APjAAAWEbauaVvfUBIwmz1mKfOLMIQIxfOJa89YjEfCxgkKaE+98gOj0 b/fHJgPtPcOHVaAB/4ccCAuy9qDPASw= X-Google-Smtp-Source: APXvYqxVht55Rh2lEdhJEJ2cR6PvuYxq23w9Fzb7t2xra9A9EET335ygASoTEi1Z3JOURmCXKWWPGw== X-Received: by 2002:a9d:7ac2:: with SMTP id m2mr20107963otn.239.1554748106416; Mon, 08 Apr 2019 11:28:26 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Mon, 8 Apr 2019 14:27:48 -0400 Message-Id: <20190408182748.1238-6-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190408182748.1238-1-jan.bobek@gmail.com> References: <20190408182748.1238-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::344 Subject: [Qemu-devel] [RISU PATCH 5/5] risu_i386: remove old unused code 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=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek , Stefan Hajnoczi , Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The code being removed is a remnant of the past implementation; it has since been replaced by its more powerful, architecture-independent counterpart in reginfo.c. Signed-off-by: Jan Bobek Reviewed-by: Alex Benn=C3=A9e --- risu_i386.c | 58 ----------------------------------------------------- 1 file changed, 58 deletions(-) diff --git a/risu_i386.c b/risu_i386.c index eb4dff4..14b0db3 100644 --- a/risu_i386.c +++ b/risu_i386.c @@ -16,13 +16,6 @@ #include "risu.h" #include "risu_reginfo_i386.h" =20 -struct reginfo master_ri, apprentice_ri; - -static int insn_is_ud2(uint32_t insn) -{ - return ((insn & 0xffff) =3D=3D 0x0b0f); -} - void advance_pc(void *vuc) { ucontext_t *uc =3D (ucontext_t *) vuc; @@ -61,54 +54,3 @@ uintptr_t get_pc(struct reginfo *ri) { return ri->gregs[REG_EIP]; } - -int send_register_info(int sock, void *uc) -{ - struct reginfo ri; - fill_reginfo(&ri, uc); - return send_data_pkt(sock, &ri, sizeof(ri)); -} - -/* Read register info from the socket and compare it with that from the - * ucontext. Return 0 for match, 1 for end-of-test, 2 for mismatch. - * NB: called from a signal handler. - */ -int recv_and_compare_register_info(int sock, void *uc) -{ - int resp; - fill_reginfo(&master_ri, uc); - recv_data_pkt(sock, &apprentice_ri, sizeof(apprentice_ri)); - if (memcmp(&master_ri, &apprentice_ri, sizeof(master_ri)) !=3D 0) { - /* mismatch */ - resp =3D 2; - } else if (insn_is_ud2(master_ri.faulting_insn)) { - /* end of test */ - resp =3D 1; - } else { - /* either successful match or expected undef */ - resp =3D 0; - } - send_response_byte(sock, resp); - return resp; -} - -/* Print a useful report on the status of the last comparison - * done in recv_and_compare_register_info(). This is called on - * exit, so need not restrict itself to signal-safe functions. - * Should return 0 if it was a good match (ie end of test) - * and 1 for a mismatch. - */ -int report_match_status(void) -{ - fprintf(stderr, "match status...\n"); - fprintf(stderr, "master reginfo:\n"); - dump_reginfo(&master_ri); - fprintf(stderr, "apprentice reginfo:\n"); - dump_reginfo(&apprentice_ri); - if (memcmp(&master_ri, &apprentice_ri, sizeof(master_ri)) =3D=3D 0) { - fprintf(stderr, "match!\n"); - return 0; - } - fprintf(stderr, "mismatch!\n"); - return 1; -} --=20 2.20.1