From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ot1-x336.google.com (mail-ot1-x336.google.com [IPv6:2607:f8b0:4864:20::336]) by sourceware.org (Postfix) with ESMTPS id 106903858D20 for ; Wed, 12 Jul 2023 20:45:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 106903858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-ot1-x336.google.com with SMTP id 46e09a7af769-6b87d505e28so6122852a34.2 for ; Wed, 12 Jul 2023 13:45:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689194736; x=1691786736; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=iQEgk/MuJ/ulamLlaN8pWR/iLfujm55ZOB1uZmXetFY=; b=OKqvDZhDHxxDWGAF+x1nmgBtNh60NtNNUKz/9GgB5yFvapMzb5lcjESz3AsS7mVC0K gwmsP2Fk367BE/0PVsTajnSOdl56RU8QHLQFAcEOJuf8yQPb+MwBHKiGtHZ99hkjB43U nAS4FfQEJEM6um3zDQRamecyjsBQj9sZXg8u4+W+s++icU255wqCk0PCl6ml/12b11GW NrHnjTKUj+DXsKkQ4oSKqiaBXNkbG0N3oiJiuhynb0qopi6G70Yf9xBZ705+ARuwfY7h N+UaVCYVYB/pqXXb3p5hka+o1kzAoUU1mKqRNURqThjR97e5Gz0ekxj68iVokEOIxDBS m7Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689194736; x=1691786736; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iQEgk/MuJ/ulamLlaN8pWR/iLfujm55ZOB1uZmXetFY=; b=IAw2AfwMFnkLxdrTyz8FtCOf9lAowBdf8fyrnSWxKDDAmrE15Oe6hBx8uAbEtFvwbg UBVDhyfCwN79yvYWZ0HrC8HrUjXKNV3HQwNV4yBmErxwL3AQr2GcOxXU7hSHySghWElO fZAOeXrLCoR5/2/g5S7150pZvM9i12o2/xfnIwFxywkdSWqm/W6WJMuuakUsLeOjOtlw C92OMzaoLenMgswKP/guFBsrcQ5SFmhWcwrJIV9uNnZt42PVA2obZVsMNpduDFN95oEL pjA9+7aSW1/7uI6CP7UgLQyLza2eVsHeGxcGGiZWFlkDEH8nAU56s11uu3FmrCLDS8HB 6YJQ== X-Gm-Message-State: ABy/qLYAkpC0ssdDea8JHvDLhXIGQYQb4yXZw8nnIjOtyvrtZXUs9pj9 fdNGBGAKkrXdXKnCmAEIZ5kiEYhA//EmNzVFq7FT3w== X-Google-Smtp-Source: APBJJlF+4nvJUeTt7z47e/P74jDMb9uOr/MFBIq2F/ffUkBvDApsd2/35edKv1SjzkR19bHlUIM+oQ== X-Received: by 2002:a05:6830:e88:b0:6b7:507a:e13 with SMTP id dp8-20020a0568300e8800b006b7507a0e13mr18320751otb.19.1689194736584; Wed, 12 Jul 2023 13:45:36 -0700 (PDT) Received: from ?IPV6:2804:1b3:a7c3:e0c8:888a:7c3c:d147:66d0? ([2804:1b3:a7c3:e0c8:888a:7c3c:d147:66d0]) by smtp.gmail.com with ESMTPSA id q5-20020a9d6645000000b006b73c264e30sm2272296otm.17.2023.07.12.13.45.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 12 Jul 2023 13:45:36 -0700 (PDT) Message-ID: Date: Wed, 12 Jul 2023 17:45:32 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH v4 3/6] stdlib: qsort: Move some macros to inline function Content-Language: en-US To: Noah Goldstein Cc: libc-alpha@sourceware.org References: <20230711190722.4028821-1-adhemerval.zanella@linaro.org> <20230711190722.4028821-4-adhemerval.zanella@linaro.org> From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 11/07/23 20:44, Noah Goldstein wrote: > On Tue, Jul 11, 2023 at 2:10 PM Adhemerval Zanella via Libc-alpha > wrote: >> >> --- >> stdlib/qsort.c | 33 +++++++++++++++++++++++---------- >> 1 file changed, 23 insertions(+), 10 deletions(-) >> >> diff --git a/stdlib/qsort.c b/stdlib/qsort.c >> index 00637208ab..134e784bd1 100644 >> --- a/stdlib/qsort.c >> +++ b/stdlib/qsort.c >> @@ -118,15 +118,28 @@ typedef struct >> char *hi; >> } stack_node; >> >> -/* The next 4 #defines implement a very fast in-line stack abstraction. */ >> /* The stack needs log (total_elements) entries (we could even subtract >> log(MAX_THRESH)). Since total_elements has type size_t, we get as >> upper bound for log (total_elements): >> bits per byte (CHAR_BIT) * sizeof(size_t). */ >> -#define STACK_SIZE (CHAR_BIT * sizeof (size_t)) >> -#define PUSH(low, high) ((void) ((top->lo = (low)), (top->hi = (high)), ++top)) >> -#define POP(low, high) ((void) (--top, (low = top->lo), (high = top->hi))) >> -#define STACK_NOT_EMPTY (stack < top) >> +enum { STACK_SIZE = CHAR_BIT * sizeof (size_t) }; >> + >> +static inline stack_node * >> +push (stack_node *top, char *lo, char *hi) >> +{ >> + top->lo = lo; >> + top->hi = hi; >> + return ++top; >> +} >> + >> +static inline stack_node * >> +pop (stack_node *top, char **lo, char **hi) >> +{ >> + --top; >> + *lo = top->lo; >> + *hi = top->hi; >> + return top; >> +} >> >> >> /* Order size using quicksort. This implementation incorporates >> @@ -232,9 +245,9 @@ _quicksort (void *const pbase, size_t total_elems, size_t size, >> stack_node stack[STACK_SIZE]; >> stack_node *top = stack; >> >> - PUSH (NULL, NULL); >> + top = push (top, NULL, NULL); >> > You could also drop this push and just set `top = stack + 1;` Ack.