From owner-svn-src-head@freebsd.org Tue May 22 13:45:41 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BCAC6EF653C; Tue, 22 May 2018 13:45:41 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 723C57540A; Tue, 22 May 2018 13:45:41 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5388014CCC; Tue, 22 May 2018 13:45:41 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4MDjfRA015958; Tue, 22 May 2018 13:45:41 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4MDjfSg015957; Tue, 22 May 2018 13:45:41 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201805221345.w4MDjfSg015957@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 22 May 2018 13:45:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334042 - head/sys/i386/include X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/i386/include X-SVN-Commit-Revision: 334042 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 May 2018 13:45:41 -0000 Author: kib Date: Tue May 22 13:45:40 2018 New Revision: 334042 URL: https://svnweb.freebsd.org/changeset/base/334042 Log: Use local unique labels inside most often used macros. Discussed with: bde Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/sys/i386/include/asmacros.h Modified: head/sys/i386/include/asmacros.h ============================================================================== --- head/sys/i386/include/asmacros.h Tue May 22 13:45:24 2018 (r334041) +++ head/sys/i386/include/asmacros.h Tue May 22 13:45:40 2018 (r334042) @@ -189,9 +189,9 @@ movl PCPU(KESP0), %edx movl $TF_SZ, %ecx testl $PSL_VM, TF_EFLAGS(%esp) - jz 1001f + jz .L\@.1 addl $VM86_STACK_SPACE, %ecx -1001: subl %ecx, %edx +.L\@.1: subl %ecx, %edx movl %edx, %edi movl %esp, %esi rep; movsb @@ -199,9 +199,9 @@ .endm .macro LOAD_KCR3 - call 1000f -1000: popl %eax - movl (tramp_idleptd - 1000b)(%eax), %eax + call .L\@.1 +.L\@.1: popl %eax + movl (tramp_idleptd - .L\@.1)(%eax), %eax movl %eax, %cr3 .endm @@ -212,17 +212,17 @@ .macro KENTER testl $PSL_VM, TF_EFLAGS(%esp) - jz 1f + jz .L\@.1 LOAD_KCR3 movl PCPU(CURPCB), %eax testl $PCB_VM86CALL, PCB_FLAGS(%eax) - jnz 3f + jnz .L\@.3 NMOVE_STACKS - jmp 3f -1: testb $SEL_RPL_MASK, TF_CS(%esp) - jz 3f -2: MOVE_STACKS -3: + jmp .L\@.3 +.L\@.1: testb $SEL_RPL_MASK, TF_CS(%esp) + jz .L\@.3 +.L\@.2: MOVE_STACKS +.L\@.3: .endm #endif /* LOCORE */