From 232abc0d4aecef1de74eddfda3153bbf6aad987c Mon Sep 17 00:00:00 2001 From: Po Lu Date: Mon, 14 Apr 2025 09:10:14 +0800 Subject: [PATCH] Fix typos in executable loaders * exec/loader-aarch64.s (skip_environ, cleanup): Minor thinkos. * exec/loader-x86_64.s (skip_environ): Insert missing label. (cherry picked from commit 462bd149cddc2a7ba81de7ad0c286bcb64681d69) --- exec/loader-aarch64.s | 4 ++-- exec/loader-x86_64.s | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exec/loader-aarch64.s b/exec/loader-aarch64.s index 64f95725eca..376f439417f 100644 --- a/exec/loader-aarch64.s +++ b/exec/loader-aarch64.s @@ -167,7 +167,7 @@ skip_environ: 1: ldrb w3, [x2], #1 strb w3, [x1], #1 cmp x2, x9 - bls 1b + blo 1b copy_env_and_args: // Copy argc and the environment array. mov x8, x10 @@ -204,7 +204,7 @@ cleanup: 1: ldrb w3, [x5], #1 strb w3, [x7], #1 cmp x5, x9 - bls 1b + blo 1b // Close file descriptors. 2: cmp x28, #-1 // is secondary fd set? beq cleanup1 // not set diff --git a/exec/loader-x86_64.s b/exec/loader-x86_64.s index 236f8d6670f..9340ac8fc65 100644 --- a/exec/loader-x86_64.s +++ b/exec/loader-x86_64.s @@ -162,7 +162,7 @@ skip_environ: rep movsb # copy file name movq %r10, %rsi # file name /* Preserve jump command. */ - cmpq %r8, %r11 # decide copy direction +1: cmpq %r8, %r11 # decide copy direction jb 1f # copy forward movq 48(%r8), %rax movq %rax, 48(%r11) # %r11->at_base -- 2.39.5