From patchwork Fri Sep 3 17:11:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 44845 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E0A843847818 for ; Fri, 3 Sep 2021 17:15:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E0A843847818 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1630689346; bh=74mSgnP+ZRmSN7IKQEVD7zoiIgsEFZxmc9drKk3Mu6U=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=YWZbdtaOY+k8IbOfCzP/Tq2+mBVL3EVCoydBsLwZbfi9bLenrqdGzFfwZkpNwhiqm K4UrvJsgvRaI2d4rZrHPamq5V2dCCAHKbBCK3DodA0VLm+KzSLr7WAdiE2pth4S/OM u+KIyLzC3UApDcKSJShfgNj9TyoJI9QJbBH+ov8U= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) by sourceware.org (Postfix) with ESMTPS id C1098384780C for ; Fri, 3 Sep 2021 17:11:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C1098384780C Received: by mail-qk1-x72f.google.com with SMTP id t190so6487839qke.7 for ; Fri, 03 Sep 2021 10:11:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=74mSgnP+ZRmSN7IKQEVD7zoiIgsEFZxmc9drKk3Mu6U=; b=TaPsd+qBv58hvoo8/s2dUaQ5bolW3usd86Ya5+yKNUcG9mGgxKbiPdiFbSqMO4v6Xy y2/682+CFY2UZrMiQddme1mt/sKXdGHoyBPD1TGHRYuTc1b3zN5mgMN8qcTjc9Z0cB0v TsgiClDXKFHSu1GOgrS425Ba8ZUDFoJkpyWMvamgvXpiDlLFLU0epcxq5rb9gjaNdqbj 7t8MjUBiYSvi19joixN4qm2Xhw1PkXkFyqj9ifud/W4znE+f+mteQ8juAy1F/xhqR5Bo JKoNIPLJIGlEewEfLY481MQ0QHmV+Ghe55A+eI2SRdBFxd6usl4eH4LbwVcvj+SKNS6R c0TQ== X-Gm-Message-State: AOAM532xtRZSOJueEDD/z/CnxRXkn4ps2f6qu6MjIVvvv9pJQhUKOYEE 9GsKPzeJluQ6f2qyVZBCuQbbE1mCoixtFQ== X-Google-Smtp-Source: ABdhPJx9uCEQmZZwZtNLBrL2uQBiF2k0Y673zf7MnJcBq9Qh7JQgyuMtD6oLGpvQq7HZpKId/41NDg== X-Received: by 2002:a05:620a:318e:: with SMTP id bi14mr4317643qkb.274.1630689114913; Fri, 03 Sep 2021 10:11:54 -0700 (PDT) Received: from birita.. ([2804:431:c7cb:733d:fff8:7487:556e:e293]) by smtp.gmail.com with ESMTPSA id r4sm3207071qtw.5.2021.09.03.10.11.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 10:11:54 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v3 5/7] stdlib: qsort: Move some macros to inline function Date: Fri, 3 Sep 2021 14:11:42 -0300 Message-Id: <20210903171144.952737-6-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210903171144.952737-1-adhemerval.zanella@linaro.org> References: <20210903171144.952737-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Change the macro PUSH and POP and rmeove the macro STACK_NOT_EMPTY. --- stdlib/qsort.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/stdlib/qsort.c b/stdlib/qsort.c index b69417dedd..5df640362d 100644 --- a/stdlib/qsort.c +++ b/stdlib/qsort.c @@ -115,15 +115,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 @@ -229,9 +242,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); - while (STACK_NOT_EMPTY) + while (stack < top) { char *left_ptr; char *right_ptr; @@ -296,7 +309,7 @@ _quicksort (void *const pbase, size_t total_elems, size_t size, { if ((size_t) (hi - left_ptr) <= max_thresh) /* Ignore both small partitions. */ - POP (lo, hi); + top = pop (top, &lo, &hi); else /* Ignore small left partition. */ lo = left_ptr; @@ -307,13 +320,13 @@ _quicksort (void *const pbase, size_t total_elems, size_t size, else if ((right_ptr - lo) > (hi - left_ptr)) { /* Push larger left partition indices. */ - PUSH (lo, right_ptr); + top = push (top, lo, right_ptr); lo = left_ptr; } else { /* Push larger right partition indices. */ - PUSH (left_ptr, hi); + top = push (top, left_ptr, hi); hi = right_ptr; } }