From nobody Mon Feb 5 23:45:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TTNKy25vCz59HmT; Mon, 5 Feb 2024 23:45:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TTNKy10Stz45g4; Mon, 5 Feb 2024 23:45:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707176742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wx0PeZg8jixzuU2B+lcqmg8+WEF9OcE+SGDqQmMjEPc=; b=I4PV0ZvfA7oKdSia3IiykYi6Ju5X5AeBkKMIRKHFsIUh5qpmPS7FopbQarKmx8x/+xl9hB PP9FmsSJgeNFy3e9NAe61RnOxGBsKB8O2z9vZem4BIdu6DVFaJeNQb5Fo+9MEbPCbRJ1bf RhqGv1xSEalKnKCj8dirNEPt/3uPkdKnnMM1Mz9fkconFRx0d75DacQCHwg8F2Y8ymqO1m s42ZhUmR+b2fjr/+45jdz18M7dlEb56+LXxFvGuup7RTSkqxteZZweRQumgpiHU52eS3Qs YjN+SE+PfVTGm7WlFyJhHmQI7luLrNfEF/TZTfHOFJXXs6kq3geomyE66xdu9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707176742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wx0PeZg8jixzuU2B+lcqmg8+WEF9OcE+SGDqQmMjEPc=; b=wNTXy9vDUxO2sieIMgEfai1ZsAf46wpQxEGJ7+o5tSQFXB1YRE8bDQfGabP7RbKXVVk/9k IiFJcXFsKXAj9nI/cBodRk304CvzuiVAFeTTDhTGzz9MB+k1LEd7AR/oqejNhrBp79iaFr S9XaXVpI2qPMMDahWVrSMaCbn//vUdj9psdU5eCavEVBgPwsDR3a30YK41Ep3M76kRY2Sw P/eXsf3UNZFdPXGghztJCKD46DvzySejUsrl2Z7QmHde129mvpD/BJzBq7HtOfCPcQZquo B/bD9nQAnyemnW49caN82N8mmZu/tBmKEBvH7HtdZvcbLq6J6ZTzkh0VK7EP3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707176742; a=rsa-sha256; cv=none; b=Ph2+gZZrDDUIUTo/nUHZYpH+1VoQGgJ4unubcFJcrJdlYbNbv56idbVcbT85yPMocessUI LVpLIYJof6r4/tsJTdIzLhptkzfaC1IZ7wShml7aMOCv8JjNVxhsxAoWf/b23n9m4zLSH/ 8Mob7axXzzOUvXvUUJI0rdJaEwamdI6+r4miss/5WAvZo73GLd/F11NYQuq3Ki0BUidqSI 7uf9faNez1LIiJJoAqd0z5J+3JQhnIJNejdj/+lZL+xyi4n+WRUQAf4f2GWEZV5LYlGemn SnRXNwyjaB2Ld7tnx1pUXXAHfvC+hkqniyCe0uQuembg2o0TDkPoXl0zK2TORA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TTNKx6ttwz11CW; Mon, 5 Feb 2024 23:45:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 415NjfeO087889; Mon, 5 Feb 2024 23:45:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 415NjfaN087886; Mon, 5 Feb 2024 23:45:41 GMT (envelope-from git) Date: Mon, 5 Feb 2024 23:45:41 GMT Message-Id: <202402052345.415NjfaN087886@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: bf20896da454 - main - i386: Use bool for booleans in getmemsize List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf20896da4545067eec2e6d8203a57fcdcee52cf Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bf20896da4545067eec2e6d8203a57fcdcee52cf commit bf20896da4545067eec2e6d8203a57fcdcee52cf Author: John Baldwin AuthorDate: 2024-02-05 23:39:31 +0000 Commit: John Baldwin CommitDate: 2024-02-05 23:39:31 +0000 i386: Use bool for booleans in getmemsize Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43716 --- sys/i386/i386/machdep.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index ac675bd0dd42..008d67017f68 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -1130,10 +1130,11 @@ physmap_done: if (physmap[i + 1] < end) end = trunc_page(physmap[i + 1]); for (pa = round_page(physmap[i]); pa < end; pa += PAGE_SIZE) { - int tmp, page_bad, full; int *ptr; + int tmp; + bool full, page_bad; - full = FALSE; + full = false; /* * block out kernel memory as not available. */ @@ -1148,7 +1149,7 @@ physmap_done: && pa < dcons_addr + dcons_size) goto do_dump_avail; - page_bad = FALSE; + page_bad = false; if (memtest == 0) goto skip_memtest; @@ -1163,25 +1164,25 @@ physmap_done: */ *(volatile int *)ptr = 0xaaaaaaaa; if (*(volatile int *)ptr != 0xaaaaaaaa) - page_bad = TRUE; + page_bad = true; /* * Test for alternating 0's and 1's */ *(volatile int *)ptr = 0x55555555; if (*(volatile int *)ptr != 0x55555555) - page_bad = TRUE; + page_bad = true; /* * Test for all 1's */ *(volatile int *)ptr = 0xffffffff; if (*(volatile int *)ptr != 0xffffffff) - page_bad = TRUE; + page_bad = true; /* * Test for all 0's */ *(volatile int *)ptr = 0x0; if (*(volatile int *)ptr != 0x0) - page_bad = TRUE; + page_bad = true; /* * Restore original value. */ @@ -1191,7 +1192,7 @@ skip_memtest: /* * Adjust array of valid/good pages. */ - if (page_bad == TRUE) + if (page_bad == true) continue; /* * If this good page is a continuation of the @@ -1212,7 +1213,7 @@ skip_memtest: printf( "Too many holes in the physical address space, giving up\n"); pa_indx--; - full = TRUE; + full = true; goto do_dump_avail; } phys_avail[pa_indx++] = pa; /* start */