From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oo1-xc2f.google.com (mail-oo1-xc2f.google.com [IPv6:2607:f8b0:4864:20::c2f]) by sourceware.org (Postfix) with ESMTPS id DCAA53858C00 for ; Thu, 13 Jul 2023 13:25:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DCAA53858C00 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-oo1-xc2f.google.com with SMTP id 006d021491bc7-56598263d1dso544288eaf.0 for ; Thu, 13 Jul 2023 06:25:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689254747; x=1691846747; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ikkUZT/PzqP9Wel3HMCh5l5zlqVta5aARi+ES/ylbRQ=; b=e6bD3t0ojc9nG7BU/k8/ZV0RY8m57sWqO/Ha3mv07wmk2PmDq07umANlECIzBJh6A6 nHs9TGFi0Ht0oH01qThcvo26GTSBHULMEKZf7s6Mx9ug3nfW6oxoCKXF2SUNZsYRYUac rnEQGejbR9soQsKcj1qejis9UAXJr/5J56k5/W4dVNISFEVYMRSMdAFxzqs1Z7qHeZAx EZ1KmJUjfXDcCHOfKbhLqPCBrj7AWZEiP5FWhqNrxr8wf63Xp0wBmxQsqzgMNpwgD/5D DHw7DdOAOtRdZTfDI9uwMiRM+iLooIU/PZWQYOsMcK0u9X2YRSOhIs0pYF8iU2+pWXYH JnjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689254747; x=1691846747; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ikkUZT/PzqP9Wel3HMCh5l5zlqVta5aARi+ES/ylbRQ=; b=eSVGRx+dFmYTMFm3wQh4+gBD4H5nICylQgeFN5cMYy9soEHs0rBGxV7PWXadIxwkbl JoMXVRIborKR5AP5JCleFbtLuNs9eg23vNHwE371a/qey74kodZqTTu3yIUh/cdMv1LY yBT+fhvtF5qmM6FrD3GGPANmHCyd0PpiXWwUEvqrshBF6t9FkJd2T/+o6h61Pf43sUea +/+9J5sFYT0O2OzrW+Z+zGgNarHK5AZ4wo9Dn74l+ur/XKIYhGrZK5xCbVDzBmxGqHjm d+WfmYD1D3L4OBRrwNAfsfBcfbUFkTgafxv5NOSmhrYQ7Z05ZGxzhOcDJZ3k1e2zqDwK avxA== X-Gm-Message-State: ABy/qLaAYWTkZcWhgAAscjROprU+695rm6T2c88HFzhGX/0OeHUu+E16 7Gu5xe0JmlUru60eajRZ4zxKMImgghgcW6CUPkfgeg== X-Google-Smtp-Source: APBJJlFduUnkNemnyuVEE3jwkmrumPoyy36LzfAGLszR60hW10l+ZwWj1tCjA6NNozvVzIhppvkqew== X-Received: by 2002:a4a:8101:0:b0:566:97a9:b73b with SMTP id b1-20020a4a8101000000b0056697a9b73bmr1187732oog.2.1689254747634; Thu, 13 Jul 2023 06:25:47 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c0:5656:8d9b:78e7:d879:79cf]) by smtp.gmail.com with ESMTPSA id d195-20020a4a52cc000000b00541fbbbcd31sm2888856oob.5.2023.07.13.06.25.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jul 2023 06:25:47 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v5 3/6] stdlib: qsort: Move some macros to inline function Date: Thu, 13 Jul 2023 10:25:37 -0300 Message-Id: <20230713132540.2854320-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230713132540.2854320-1-adhemerval.zanella@linaro.org> References: <20230713132540.2854320-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.5 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,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: --- stdlib/qsort.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/stdlib/qsort.c b/stdlib/qsort.c index 410a8d7731..53013ef281 100644 --- a/stdlib/qsort.c +++ b/stdlib/qsort.c @@ -114,15 +114,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 @@ -226,11 +239,9 @@ _quicksort (void *const pbase, size_t total_elems, size_t size, char *lo = base_ptr; char *hi = &lo[size * (total_elems - 1)]; stack_node stack[STACK_SIZE]; - stack_node *top = stack; - - PUSH (NULL, NULL); + stack_node *top = stack + 1; - while (STACK_NOT_EMPTY) + while (stack < top) { char *left_ptr; char *right_ptr; @@ -295,7 +306,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; @@ -306,13 +317,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; } } -- 2.34.1