From nobody Wed Oct 19 14:40:31 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mstgg4PJ8z4g6qk; Wed, 19 Oct 2022 14:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mstgg3cjRz3QZH; Wed, 19 Oct 2022 14:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666190431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WBn3W1GGnpuc68cjtO4kRv3jNS4+jz9/2xaZxGnf00E=; b=t2m0p3Mn9YM0EYJPBv2w5duYEUVpi4JKAi2RkO2DJuKKmigncFz23wIINLacqsRB1tzfyn dDn5FWclxqDEMCcKiKMVJWv2XzvYuyi/zi5pQ34rUReKvuYQQ0TwLVwogOqmDCRPxPjh/T YjRAB6DUxzfvHel0EC19ekF4lIufRuZoW5cntD2ddhDH6a2GIQDL0gyoXyicjfJv+hJGO5 oPvKUx5yRsejJArluMNU0T351D8hTQKYTuSQU2Fld2swf8hSZ0ylnEaN998K4Z0u3jzo35 uDItk+/cXuHApC9KQb1yPWw7/OuQZ53EH8tngJsz47sLQHuYbL7EzminNIw7Zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mstgg2R1XzYvm; Wed, 19 Oct 2022 14:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29JEeVLa069383; Wed, 19 Oct 2022 14:40:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29JEeVaa069382; Wed, 19 Oct 2022 14:40:31 GMT (envelope-from git) Date: Wed, 19 Oct 2022 14:40:31 GMT Message-Id: <202210191440.29JEeVaa069382@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: cd8abeb1c5e6 - stable/13 - dtrace: Drop illumos ifdefs for CPU register definitions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cd8abeb1c5e687b145571a0a57377cf5fd24a81a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666190431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WBn3W1GGnpuc68cjtO4kRv3jNS4+jz9/2xaZxGnf00E=; b=aQRMj74gtnvu6grljc9jI/Ji4b+oH1WioTJP+bxgvPfFbFxAMs+RAWB3ho0F55OgevVRMD Y4pqUYlmC1ed6OIUZ+k9SyZfwiw5z1DlPuWLXp3H9W+a/ma+uxSkjArafH1goVV5cm7nMi dT5Z64tDN3fkhxj1uaqXVMRdJXFEmzfScQxbvIq7h0kJaFCXmDmjtWiu7ilLMYkys3qssp DAFFZj18PXBGYiRoeKIvcw0RxEzUT7TrNXko/QgZSFrtwuw23FBfbMAoF0Pal+GQOPL7pv tWo/ihSVBL1stSVg616FzroAltnTY99ARW21xyXzDmPeV4GFt3dpr4llQfwXmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666190431; a=rsa-sha256; cv=none; b=G51xYCoxIvb8P5DOLFcYHUz2IBZ7/VSpiouV5EWp8o1TO5D3YFvN01jvLtJrS5+IBeuSaz zuV+XuejlxYJ40xSWJ7/L3wciZkASTooBjNsz/mLw7PGGT49EHPFczdhiSdQKyE1VCMjp7 V4sLlVzVeo1RR5JN7Qwj478mkylp0DQnXtioxsMSnh41oBQx+U2xqN2iqvSb12Evz08xbB 1d65Fbk3sT72i4QeUboR6MvLLcD07GM2z5UZNRrGG6Cy5ehq7F5d7ypOZ2d8hGW/iXsYM4 +YRQo++MSGe2/BBDMTU2SfO7BiLMEk8KQ8vgrO39rUh+UEK1wLyIHOxGUD7x/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cd8abeb1c5e687b145571a0a57377cf5fd24a81a commit cd8abeb1c5e687b145571a0a57377cf5fd24a81a Author: Mark Johnston AuthorDate: 2022-10-12 19:59:00 +0000 Commit: Mark Johnston CommitDate: 2022-10-19 14:15:49 +0000 dtrace: Drop illumos ifdefs for CPU register definitions These are fixed, so having upstream's version is not especially useful, and the duplicated definitions make for confusing reading. No functional change intended. (cherry picked from commit b34a6e0fed4af33671c79347deb77e3e93930df3) --- sys/cddl/dev/dtrace/amd64/dtrace_isa.c | 8 ------ sys/cddl/dev/dtrace/x86/regset.h | 52 ---------------------------------- 2 files changed, 60 deletions(-) diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_isa.c b/sys/cddl/dev/dtrace/amd64/dtrace_isa.c index 71b448a99c1c..55e51cee14d8 100644 --- a/sys/cddl/dev/dtrace/amd64/dtrace_isa.c +++ b/sys/cddl/dev/dtrace/amd64/dtrace_isa.c @@ -501,11 +501,7 @@ dtrace_getreg(struct trapframe *rp, uint_t reg) REG_SS /* 18 SS */ }; -#ifdef illumos - if (reg <= SS) { -#else /* !illumos */ if (reg <= GS) { -#endif if (reg >= sizeof (regmap) / sizeof (int)) { DTRACE_CPUFLAG_SET(CPU_DTRACE_ILLOP); return (0); @@ -514,11 +510,7 @@ dtrace_getreg(struct trapframe *rp, uint_t reg) reg = regmap[reg]; } else { /* This is dependent on reg.d. */ -#ifdef illumos - reg -= SS + 1; -#else /* !illumos */ reg -= GS + 1; -#endif } switch (reg) { diff --git a/sys/cddl/dev/dtrace/x86/regset.h b/sys/cddl/dev/dtrace/x86/regset.h index ad12e26a5aec..b480e411e6c2 100644 --- a/sys/cddl/dev/dtrace/x86/regset.h +++ b/sys/cddl/dev/dtrace/x86/regset.h @@ -61,35 +61,6 @@ extern "C" { #define REG_GSBASE 27 #define REG_FSBASE 26 -#ifdef illumos -#define REG_DS 25 -#define REG_ES 24 - -#define REG_GS 23 -#define REG_FS 22 -#define REG_SS 21 -#define REG_RSP 20 -#define REG_RFL 19 -#define REG_CS 18 -#define REG_RIP 17 -#define REG_ERR 16 -#define REG_TRAPNO 15 -#define REG_RAX 14 -#define REG_RCX 13 -#define REG_RDX 12 -#define REG_RBX 11 -#define REG_RBP 10 -#define REG_RSI 9 -#define REG_RDI 8 -#define REG_R8 7 -#define REG_R9 6 -#define REG_R10 5 -#define REG_R11 4 -#define REG_R12 3 -#define REG_R13 2 -#define REG_R14 1 -#define REG_R15 0 -#else /* !illumos */ #define REG_SS 25 #define REG_RSP 24 #define REG_RFL 23 @@ -116,33 +87,11 @@ extern "C" { #define REG_R13 2 #define REG_R14 1 #define REG_R15 0 -#endif /* illumos */ /* * The names and offsets defined here are specified by i386 ABI suppl. */ -#ifdef illumos -#define SS 18 /* only stored on a privilege transition */ -#define UESP 17 /* only stored on a privilege transition */ -#define EFL 16 -#define CS 15 -#define EIP 14 -#define ERR 13 -#define TRAPNO 12 -#define EAX 11 -#define ECX 10 -#define EDX 9 -#define EBX 8 -#define ESP 7 -#define EBP 6 -#define ESI 5 -#define EDI 4 -#define DS 3 -#define ES 2 -#define FS 1 -#define GS 0 -#else /* !illumos */ #define GS 18 #define SS 17 /* only stored on a privilege transition */ #define UESP 16 /* only stored on a privilege transition */ @@ -162,7 +111,6 @@ extern "C" { #define DS 2 #define ES 1 #define FS 0 -#endif /* illumos */ #define REG_PC EIP #define REG_FP EBP