From nobody Tue Jan 23 16:45:31 2024 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 4TKCd81ZY6z57gW6; Tue, 23 Jan 2024 16:45:32 +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 4TKCd811Bzz4vqH; Tue, 23 Jan 2024 16:45:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706028332; 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=1Ry1phDUK9yF+m066OlXZ6SimsrTHTemGxLv2n0CkZ4=; b=EqRQ7gGtYV7oFldZaaO62vZzy9v23xOavymP1s1aX/jwGcoq3R/eaYTCPB86TbPSL5iSbJ 6TS1+razpgOiTthPBXLSNwYDihqFQLvq1c8or0XHjWLaA6lLtS638iTbmIDWnF1YyefNm1 f80BkkKntWuY2BwiPIcSJWz7qYk1/EbjWSNvQuXEcfKZBq0JZP/nSy0Pn3IzOOLXwh0oTG y2lYEWOFmzJ9FfLOnuEIfops2J5GR4fJ1VAR3O78wzBuLheoQKaqnFydA1s+IDc+bICeuD YbOHgIUkrlOu+6hDMXZk9OrEcuA3DBOIScbdR1gY8ZqAicH1JaV8OsCV+TYsHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706028332; 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=1Ry1phDUK9yF+m066OlXZ6SimsrTHTemGxLv2n0CkZ4=; b=C7WWX/q0pNTE7pXVGgUXYoE1tIa8jZd3Lu3/WDm2DCv3cpo13Py3nx6TNLGLbHHT7q9bLk XudG178g4iTPvEs8jSGy6+tzVcQUZFMl+jflHqYqtvRySTlo0eOqgZlLVzPZ0TmUxriCmj 0Fg6cCuAp6pDWVA+o3ulkBjQHK2j8r7U6IUeIws0UaVFWAZ2w365f9VpMm/4eDK63TU4f1 1/VWVHLWAcLMYDgr+YHUWixeEkHuNpfqMFu1Qownl/cxxzTlZlMJnbPFrG63yPV8jjdjen QJkJmNkMJeQDNULp37dmZKx+r0KFVXKPVpCjyGda3W2I/A/PgLvGw/a5zO84xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706028332; a=rsa-sha256; cv=none; b=MYXl6/cQK1HdEEg5QzlZcf/ETwkK4vg0R6aECbwT4Eq+5knWlrYXwFbbVdVpmBwXQOV0a5 PJw+nAEIzaPj24vVwhn6S493l1A4Fw7+4x18A8Dh6fQvx0GwtxQFne4xHP+p4bWiYVe2AM yrT7CvNxCkU6ytswhxmpSpyVXcjQpIV5yqwK6dCA4/2tj8jwAx01AX8ogtjN9sPlPHGOR4 E5GqVfz+C0i9JoxXIf+HOpY7keMAVCIFqm1tnc0tt6+rxelmFKPTTqCF8MiOApK1ed8fqh AC2IRma9sa6MqNp4vYO0vl5vlnNeQ/Z3vGsJBG9gzKeplghwh9rHDS0i9QilQQ== 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 4TKCd8059Gzf30; Tue, 23 Jan 2024 16:45:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40NGjV2R074293; Tue, 23 Jan 2024 16:45:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NGjVNW074290; Tue, 23 Jan 2024 16:45:31 GMT (envelope-from git) Date: Tue, 23 Jan 2024 16:45:31 GMT Message-Id: <202401231645.40NGjVNW074290@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5e728af444b1 - main - bhyve: Simplify register definitions a bit 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/main X-Git-Reftype: branch X-Git-Commit: 5e728af444b16f480ec0f43803ca2a7a3e6e2e48 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5e728af444b16f480ec0f43803ca2a7a3e6e2e48 commit 5e728af444b16f480ec0f43803ca2a7a3e6e2e48 Author: Mark Johnston AuthorDate: 2024-01-23 16:40:52 +0000 Commit: Mark Johnston CommitDate: 2024-01-23 16:40:52 +0000 bhyve: Simplify register definitions a bit It's awkward to have separate tables for information which is logically connected. Merge the gdb_regset[] and gdb_regsize[] arrays and update gdb_read_regs() to cope with the result. This makes the addition of arm64 support a bit cleaner. No functional change intended. Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D43481 --- usr.sbin/bhyve/gdb.c | 89 ++++++++++++++++++++-------------------------------- 1 file changed, 34 insertions(+), 55 deletions(-) diff --git a/usr.sbin/bhyve/gdb.c b/usr.sbin/bhyve/gdb.c index f1aabbde43fd..2ef684e82c4b 100644 --- a/usr.sbin/bhyve/gdb.c +++ b/usr.sbin/bhyve/gdb.c @@ -134,58 +134,34 @@ static struct vcpu **vcpus; static int cur_vcpu, stopped_vcpu; static bool gdb_active = false; -static const int gdb_regset[] = { - VM_REG_GUEST_RAX, - VM_REG_GUEST_RBX, - VM_REG_GUEST_RCX, - VM_REG_GUEST_RDX, - VM_REG_GUEST_RSI, - VM_REG_GUEST_RDI, - VM_REG_GUEST_RBP, - VM_REG_GUEST_RSP, - VM_REG_GUEST_R8, - VM_REG_GUEST_R9, - VM_REG_GUEST_R10, - VM_REG_GUEST_R11, - VM_REG_GUEST_R12, - VM_REG_GUEST_R13, - VM_REG_GUEST_R14, - VM_REG_GUEST_R15, - VM_REG_GUEST_RIP, - VM_REG_GUEST_RFLAGS, - VM_REG_GUEST_CS, - VM_REG_GUEST_SS, - VM_REG_GUEST_DS, - VM_REG_GUEST_ES, - VM_REG_GUEST_FS, - VM_REG_GUEST_GS -}; - -static const int gdb_regsize[] = { - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 4, - 4, - 4, - 4, - 4, - 4, - 4 +static const struct gdb_reg { + enum vm_reg_name id; + int size; +} gdb_regset[] = { + { .id = VM_REG_GUEST_RAX, .size = 8 }, + { .id = VM_REG_GUEST_RBX, .size = 8 }, + { .id = VM_REG_GUEST_RCX, .size = 8 }, + { .id = VM_REG_GUEST_RDX, .size = 8 }, + { .id = VM_REG_GUEST_RSI, .size = 8 }, + { .id = VM_REG_GUEST_RDI, .size = 8 }, + { .id = VM_REG_GUEST_RBP, .size = 8 }, + { .id = VM_REG_GUEST_RSP, .size = 8 }, + { .id = VM_REG_GUEST_R8, .size = 8 }, + { .id = VM_REG_GUEST_R9, .size = 8 }, + { .id = VM_REG_GUEST_R10, .size = 8 }, + { .id = VM_REG_GUEST_R11, .size = 8 }, + { .id = VM_REG_GUEST_R12, .size = 8 }, + { .id = VM_REG_GUEST_R13, .size = 8 }, + { .id = VM_REG_GUEST_R14, .size = 8 }, + { .id = VM_REG_GUEST_R15, .size = 8 }, + { .id = VM_REG_GUEST_RIP, .size = 8 }, + { .id = VM_REG_GUEST_RFLAGS, .size = 4 }, + { .id = VM_REG_GUEST_CS, .size = 4 }, + { .id = VM_REG_GUEST_SS, .size = 4 }, + { .id = VM_REG_GUEST_DS, .size = 4 }, + { .id = VM_REG_GUEST_ES, .size = 4 }, + { .id = VM_REG_GUEST_FS, .size = 4 }, + { .id = VM_REG_GUEST_GS, .size = 4 }, }; #ifdef GDB_LOG @@ -1031,15 +1007,18 @@ static void gdb_read_regs(void) { uint64_t regvals[nitems(gdb_regset)]; + int regnums[nitems(gdb_regset)]; + for (size_t i = 0; i < nitems(gdb_regset); i++) + regnums[i] = gdb_regset[i].id; if (vm_get_register_set(vcpus[cur_vcpu], nitems(gdb_regset), - gdb_regset, regvals) == -1) { + regnums, regvals) == -1) { send_error(errno); return; } start_packet(); - for (size_t i = 0; i < nitems(regvals); i++) - append_unsigned_native(regvals[i], gdb_regsize[i]); + for (size_t i = 0; i < nitems(gdb_regset); i++) + append_unsigned_native(regvals[i], gdb_regset[i].size); finish_packet(); }