From nobody Thu Jul 6 17:22:14 2023 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 4QxjyH1lYVz4lmjx; Thu, 6 Jul 2023 17:22:15 +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 4QxjyH1KfDz3QY3; Thu, 6 Jul 2023 17:22:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688664135; 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=5ueoaDruf3ix9/Zm8lrIuh6hGnpf5TxA7PTbkmYxDnQ=; b=UhzJEVy7DhV1tN+M20tOgs99JPpdW7BTjCkcr5igYRMd3tu/H6mlEuGqRzbau63JIT4kWa SihfFxkRvWFgXL/6o+0sO4Yb29Ypnm4gC0ch3Ke4X1enhW4vU+VlUVn4PsNXteWhEmguMX Dd2YGN7XI9XtQNNCSGKZcginZVofxoMxDzOtsIIYYmOCPTIJevovHIVKOccZqULyTFQcC2 M01Dd+2SZrZi5FTl9uJq83gdaPkI37wS/Bl5L7yCBSfNM9wDiNUu1qsHbwuV06P+WwAGs1 26Smgxu+sdVSMesDVReBAPoShYNF0REX5BKoRqpv0zCyxOrC9izOExCSxHrUnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688664135; 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=5ueoaDruf3ix9/Zm8lrIuh6hGnpf5TxA7PTbkmYxDnQ=; b=QbUkk+sdJ7zVS7/e7QxHq6Ds6EeRyqZWvz5uSieCh4SM5bTS7Isb2AV7NaSNwyIYhQTaf1 +AiEqoIDozulfI08NNdNUAM3GRr9FmLX1lrpbKg22jWPt7hJFJDgdNwqiRRu55/tRrtUoZ mxZRxRiP0384rV3djWJFIih3sij5Ah6kSUUEDqwWkklsMPNSyC/0s/z9JEFdgopGNczyl2 fOsBA10HnrjTqqTPnqVi9v2vbHpvzOLNnAulw4Mj9A30udOPbVQgGmwsVTmVxBD7+5ymop G89BMbDbaAz+jdZfJEVCeicrN9exrLC1Qqr9EGq7lzXj5Py094m5x+2LiMJ8Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688664135; a=rsa-sha256; cv=none; b=dk+5HFxvlQqXiRb49ViYP9QwKntQY09kGMXUaSycCg3LJeZqDJOM7j2x8Z0Nn3c8wygIZa S3NiI6KFowpaeGmTvZYya7+5H7s++vjmo2ufw2lVedzd+triG1DhSXOqymN4Sdsy54ywFY 80nhHWsdLEOIGqlkJ+VyNEIxppfQa1P70OI2B5MNqTmRTy01947Opl+eJEVMb8XV66c6AP iV8WB8l9wFjheK7agFVgtJQ383t3i/grIFPrwWcyl1kXKffcgvnCfWhZ5zkQLWP3RAjy+5 3QhCY698LOB8duodrn25pkqHbAOI3dY6fGYyiCY80JwvJkETDKj2riRtS+MEsQ== 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 4QxjyH0QWqz15VW; Thu, 6 Jul 2023 17:22:15 +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 366HMF4n079922; Thu, 6 Jul 2023 17:22:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 366HMEiF079921; Thu, 6 Jul 2023 17:22:14 GMT (envelope-from git) Date: Thu, 6 Jul 2023 17:22:14 GMT Message-Id: <202307061722.366HMEiF079921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: acfd26152424 - main - libc: Improve setjmp comments 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: acfd26152424b39f99cc0224c970eb5cf8ce93f0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=acfd26152424b39f99cc0224c970eb5cf8ce93f0 commit acfd26152424b39f99cc0224c970eb5cf8ce93f0 Author: Dmitry Chagin AuthorDate: 2023-07-06 17:21:54 +0000 Commit: Dmitry Chagin CommitDate: 2023-07-06 17:21:54 +0000 libc: Improve setjmp comments Reviewed by: imp, kib Differential Revision: https://reviews.freebsd.org/D40879 --- lib/libc/amd64/gen/_setjmp.S | 6 +++--- lib/libc/amd64/gen/setjmp.S | 6 +++--- lib/libc/amd64/gen/sigsetjmp.S | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/libc/amd64/gen/_setjmp.S b/lib/libc/amd64/gen/_setjmp.S index 0e1e5f8f265d..034900305e9a 100644 --- a/lib/libc/amd64/gen/_setjmp.S +++ b/lib/libc/amd64/gen/_setjmp.S @@ -48,8 +48,8 @@ __FBSDID("$FreeBSD$"); ENTRY(_setjmp) movq %rdi,%rax - movq 0(%rsp),%rdx /* retval */ - movq %rdx, 0(%rax) /* 0; retval */ + movq 0(%rsp),%rdx /* return address */ + movq %rdx, 0(%rax) /* 0; return address */ movq %rbx, 8(%rax) /* 1; rbx */ movq %rsp,16(%rax) /* 2; rsp */ movq %rbp,24(%rax) /* 3; rbp */ @@ -88,7 +88,7 @@ ENTRY(___longjmp) testq %rax,%rax jnz 1f incq %rax -1: movq %rcx,0(%rsp) +1: movq %rcx,0(%rsp) /* return address */ ret END(___longjmp) diff --git a/lib/libc/amd64/gen/setjmp.S b/lib/libc/amd64/gen/setjmp.S index 90eff9e9ed6b..173a2d29953a 100644 --- a/lib/libc/amd64/gen/setjmp.S +++ b/lib/libc/amd64/gen/setjmp.S @@ -58,8 +58,8 @@ ENTRY(setjmp) call __libc_sigprocmask popq %rdi movq %rdi,%rcx - movq 0(%rsp),%rdx /* retval */ - movq %rdx, 0(%rcx) /* 0; retval */ + movq 0(%rsp),%rdx /* return address */ + movq %rdx, 0(%rcx) /* 0; return address */ movq %rbx, 8(%rcx) /* 1; rbx */ movq %rsp,16(%rcx) /* 2; rsp */ movq %rbp,24(%rcx) /* 3; rbp */ @@ -109,7 +109,7 @@ ENTRY(__longjmp) testq %rax,%rax jnz 1f incq %rax -1: movq %rcx,0(%rsp) +1: movq %rcx,0(%rsp) /* return address */ ret END(__longjmp) diff --git a/lib/libc/amd64/gen/sigsetjmp.S b/lib/libc/amd64/gen/sigsetjmp.S index 447134122019..743b8a631d3b 100644 --- a/lib/libc/amd64/gen/sigsetjmp.S +++ b/lib/libc/amd64/gen/sigsetjmp.S @@ -66,8 +66,8 @@ ENTRY(sigsetjmp) call __libc_sigprocmask popq %rdi 2: movq %rdi,%rcx - movq 0(%rsp),%rdx /* retval */ - movq %rdx, 0(%rcx) /* 0; retval */ + movq 0(%rsp),%rdx /* return address */ + movq %rdx, 0(%rcx) /* 0; return address */ movq %rbx, 8(%rcx) /* 1; rbx */ movq %rsp,16(%rcx) /* 2; rsp */ movq %rbp,24(%rcx) /* 3; rbp */ @@ -109,7 +109,7 @@ ENTRY(__siglongjmp) testq %rax,%rax jnz 1f incq %rax -1: movq %rcx,0(%rsp) +1: movq %rcx,0(%rsp) /* return address */ ret END(__siglongjmp)