bug.h revamp, easier to use

Makefile: add 'build=' option. bug.h: numeric {BUG,WARN}_ON
del useless unlikely()
2024-07-15 08:18:35 +02:00 · 2024-07-10 07:34:05 +02:00 · 2024-06-23 07:32:22 +02:00 · 2024-05-18 13:30:46 +02:00 · 2024-03-07 22:51:48 +01:00 · 2024-02-26 19:09:15 +01:00
27 changed files with 1362 additions and 281 deletions
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -0,0 +1,4 @@
+;; emacs per-directory settings
+((nil . ((compile-command . (concat "make -C "
+                                    (vc-root-dir)
+                                    " -k -j2")))))
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,8 @@ compile_commands.json
 core
 /.ccls-cache/
 /test/test/
-/test/cutest/
+.lastbuild
+# /test/cutest/
 /tmp/
 # created when building
 /bin/
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "test/cutest"]
+	path = test/cutest
+	url = ../cutest.git
--- a/674
+++ b/674
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
--- a/104
+++ b/104
@@ -44,30 +44,88 @@ BIN       := $(addprefix $(BINDIR)/,$(TEST_FN:.c=))

 CCLSCMDS  := compile_commands.json

+##################################### Check for compiler and requested build
+BUILDS    := release dev perf debug
+# last compilation build
+BUILDFILE := .lastbuild
+lastbuild := $(file < $(BUILDFILE))
+$(info brlib last:$(lastbuild))
+# default to gcc
+CC        ?= cc
+ifeq ($(CC),cc)
+        CC = gcc
+endif
+
+# if no build specified, use last one
+ifeq ($(build),)
+        build := $(lastbuild)
+endif
+# if build is still undefined, set a default
+ifeq ($(build),)
+        build := release
+endif
+
+$(info brlib build=$(build))
+
+# check for valid build
+ifeq ($(filter $(build),$(BUILDS)),)
+        $(error Error: Unknown build=`$(build)`. Possible builds are: $(BUILDS))
+endif
+
+# if new build, rewrite BUILDFILE
+ifneq ($(build),$(lastbuild))
+        $(info New build:`$(build)` (was:$(lastbuild)))
+        $(file >$(BUILDFILE),$(build))
+endif
 ##################################### pre-processor flags
-CPPFLAGS  := -I $(INCDIR)
-#CPPFLAGS  += -DDEBUG                                       # global
-#CPPFLAGS  += -DDEBUG_DEBUG_C                               # log() funcs debug
-CPPFLAGS  += -DDEBUG_DEBUG                                  # activate logs funcs
-CPPFLAGS  += -DDEBUG_POOL                                   # mem pools
+override CPPFLAGS  += -I $(INCDIR)
+
+ifeq ($(BUILD),release)
+        CPPFLAGS  += -DNDEBUG                               # assert (unused)
+        CPPFLAGS  += -DBUG_ON=0                          CPPFLAGS  += -DWARN_ON=0                 else # ifeq ($(BUILD),dev)
+        #CPPFLAGS  += -DDEBUG                            #CPPFLAGS  += -DDEBUG_DEBUG_C                    CPPFLAGS  += -DDEBUG_DEBUG                       CPPFLAGS  += -DDEBUG_POOL                        CPPFLAGS  += -DBUG_ON=1                          CPPFLAGS  += -DWARN_ON=1                            # warn_on in bug.h
+endif

 # remove extraneous spaces (due to spaces before comments)
 CPPFLAGS  := $(strip $(CPPFLAGS))

 ##################################### compiler flags
 CFLAGS    := -std=gnu11
-CFLAGS    += -O2
-CFLAGS    += -g
+
 CFLAGS    += -Wall
 CFLAGS    += -Wextra
 CFLAGS    += -march=native
 CFLAGS    += -Wmissing-declarations
 CFLAGS    += -Wno-unused-result
+# TODO: specific to dynamic
 CFLAGS    += -fPIC
-# for gprof
-#CFLAGS    += -pg
-# Next one may be useful for valgrind (some invalid instructions)
-# CFLAGS   += -mno-tbm
+
+### dev OR release
+ifeq ($(BUILD),release)
+        CFLAGS    += -O3
+        CFLAGS    += -funroll-loops
+        CFLAGS    += -flto
+else ifeq ($(BUILD),dev)
+        CFLAGS    += -Og
+        CFLAGS    += -g
+        CFLAGS    += -ginline-points                   # inlined funcs debug info
+        # for gprof
+        #CFLAGS    += -pg
+        # Next one may be useful for valgrind (some invalid instructions)
+        # CFLAGS   += -mno-tbm
+else ifeq ($(BUILD),perf)
+        CFLAGS    += -O3
+        CFLAGS    += -g                                # symbols (gdb, perf, etc.)
+        CFLAGS    += -ginline-points                   # inlined funcs debug info
+        CFLAGS    += -funroll-loops
+else ifeq ($(BUILD),debug)
+        CFLAGS    += -O0
+        CFLAGS    += -g                                # symbols (gdb, perf, etc.)
+        # for gprof
+        #CFLAGS += -pg
+        # Next one may be useful for valgrind (when invalid instructions)
+        #CFLAGS += -mno-tbm
+endif

 CFLAGS    := $(strip $(CFLAGS))

@@ -77,14 +135,21 @@ LDFLAGS   := -L$(LIBDIR)
 LIBS      := -l$(LIB)
 DEPFLAGS   = -MMD -MP -MF $(DEPDIR)/$*.d

+ifeq ($(BUILD),release)
+        LDFLAGS   += -flto
+endif
+
 ##################################### General targets
-.PHONY: all libs compile test emacs ccls bear clean cleanall cleanallall
+.PHONY: all libs lib-static lib-dynamic compile test emacs ccls bear clean \
+        cleanall cleanallall

 # default: build libraries
 all: libs

-# default: build libraries
-libs: $(DLIB) $(SLIB)
+# libraries
+libs: lib-static lib-dynamic
+lib-static: $(SLIB)
+lib-dynamic: $(DLIB)

 # build objects
 compile: $(OBJ)
@@ -178,7 +243,8 @@ cleanobj:
 cleanobjdir:
 	$(call rmdir,$(OBJDIR),brlib objects)

-$(OBJDIR)/%.o: $(SRCDIR)/%.c | $(OBJDIR) $(DEPDIR)
+# $(OBJDIR)/%.o: $(BUILDFILE)
+$(OBJDIR)/%.o: $(SRCDIR)/%.c $(BUILDFILE) | $(OBJDIR) $(DEPDIR)
 	@echo compiling $< "->" $@.
 	$(CC) -c $(DEPFLAGS) $(CPPFLAGS) $(CFLAGS) $< -o $@

@@ -204,14 +270,16 @@ $(SLIB): $(OBJ) | $(LIBDIR)
 ##################################### testing
 .PHONY: cleanbin cleanbindir

+CUTESTSRC  := $(TESTDIR)/cutest/CuTest.c
+
 cleanbin:
 	$(call rmfiles,$(BIN),binary)

 cleanbindir:
 	$(call rmdir,$(BINDIR),binaries)

-$(BINDIR)/%: $(TESTDIR)/%.c libs | $(BINDIR)
-	$(CC) $(CPPFLAGS) $(CFLAGS) $< $(LDFLAGS) $(LIBS) -o $@
+$(BINDIR)/%: $(TESTDIR)/%.c $(SLIB) $(DLIB) | $(BINDIR)
+	$(CC) $(CPPFLAGS) $(CFLAGS) $< $(CUTESTSRC) $(LDFLAGS) $(LIBS) -o $@

 ##################################### pre-processed (.i) and assembler (.s) output
 %.i: %.c
@@ -246,7 +314,7 @@ cleanccls:
 # maybe run cleanobj cleanlibobj in commands ?
 $(CCLSCMDS): cleanobj $(SRC) | $(CCLSROOT)
 	@echo "Generating ccls compile commands file ($@)."
-	@$(BEAR) -- make test
+	@$(BEAR) -- $(MAKE) test

 ##################################### valgrind (mem check)
 .PHONY: memcheck
--- a/README.org
+++ b/README.org
@@ -0,0 +1,43 @@
+#+title: brlib - A small personal C library
+#+OPTIONS: toc:nil
+#+OPTIONS: num:2
+
+** License
+~SPDX-License-Identifier: GPL-3.0-or-later <https://spdx.org/licenses/GPL-3.0-or-later.html>~~
+
+This work is, with exceptions below, Copyright (C) 2021-2024 Bruno Raoult
+("br"), and licensed under the GNU General Public License v3.0 or later.
+
+Some rights reserved. See COPYING.
+
+*** The licence exceptions are:*
+
+**** _Cutest testing framework.__
+You can find the original work on [[https://sourceforge.net/projects/cutest/files/cutest/][sourceforge]].
+
+This software is (C) 2000-2003 Asim Jalis, under the zlib License.
+See [[test/cutest/license.txt][license local copy]] or <https://spdx.org/licenses/Zlib.html>.
+
+** Installation:
+*** clone repository
+**** user...
+#+BEGIN_EXAMPLE
+$ git clone https://github.com/braoult/brlib.git
+or
+$ git clone https://git.raoult.com/bruno/brlib.git
+#+END_EXAMPLE
+
+**** OR ...developer
+#+BEGIN_EXAMPLE
+$ git clone git@git.raoult.com:bruno/brlib.git
+$ cd brlib
+$ git remote add github git@github.com:braoult/brlib.git
+$ git fetch --all
+#+END_EXAMPLE
+
+*Add CuTest submodule (optional)*
+#+BEGIN_EXAMPLE
+$ cd brlib
+$ git submodule init
+$ git submodule update
+#+END_EXAMPLE
--- a/include/bitops-emulated/generic-bswap.h
+++ b/include/bitops-emulated/generic-bswap.h
@@ -0,0 +1,38 @@
+/* generic-bswap.h - generic bswap implementations.
+ *
+ * Copyright (C) 2024 Bruno Raoult ("br")
+ * Licensed under the GNU General Public License v3.0 or later.
+ * Some rights reserved. See COPYING.
+ *
+ * You should have received a copy of the GNU General Public License along with this
+ * program. If not, see <https://www.gnu.org/licenses/gpl-3.0-standalone.html>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later <https://spdx.org/licenses/GPL-3.0-or-later.html>
+ *
+ */
+#ifndef _GENERIC_BSWAP_H_
+#define _GENERIC_BSWAP_H_
+
+#include "brlib.h"
+
+/* Adapted from: http://www-graphics.stanford.edu/%7Eseander/bithacks.html
+ */
+static __always_inline u32 __bswap32_emulated(u32 n)
+{
+   const u32 k = 0x00FF00FF;
+   n = ((n >>  8) & k) | ((n & k) <<  8);
+   n = ( n >> 16)      | ( n      << 16);
+   return n;
+}
+
+static __always_inline u64 __bswap64_emulated(u64 n)
+{
+   const u64 k1 = 0x00FF00FF00FF00FFull;
+   const u64 k2 = 0x0000FFFF0000FFFFull;
+   n = ((n >>  8) & k1) | ((n & k1) <<  8);
+   n = ((n >> 16) & k2) | ((n & k2) << 16);
+   n = ( n >> 32)       | ( n       << 32);
+   return n;
+}
+
+#endif  /* _GENERIC_BSWAP_H_ */
--- a/include/bitops-emulated/generic-clz.h
+++ b/include/bitops-emulated/generic-clz.h
@@ -13,7 +13,7 @@
 #ifndef _GENERIC_CLZ_H_
 #define _GENERIC_CLZ_H_

-#include "br.h"
+#include "brlib.h"

 /* Adapted from: http://www-graphics.stanford.edu/%7Eseander/bithacks.html
 */
--- a/include/bitops-emulated/generic-ctz.h
+++ b/include/bitops-emulated/generic-ctz.h
@@ -13,7 +13,7 @@
 #ifndef _GENERIC_CTZ_H_
 #define _GENERIC_CTZ_H_

-#include "br.h"
+#include "brlib.h"

 /* Adapted from: http://www-graphics.stanford.edu/%7Eseander/bithacks.html
 */
--- a/include/bitops-emulated/generic-ilog2.h
+++ b/include/bitops-emulated/generic-ilog2.h
@@ -0,0 +1,60 @@
+/* generic-ilog2.h - generic ilog2 implementations.
+ *
+ * Copyright (C) 2024 Bruno Raoult ("br")
+ * Licensed under the GNU General Public License v3.0 or later.
+ * Some rights reserved. See COPYING.
+ *
+ * You should have received a copy of the GNU General Public License along with this
+ * program. If not, see <https://www.gnu.org/licenses/gpl-3.0-standalone.html>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later <https://spdx.org/licenses/GPL-3.0-or-later.html>
+ *
+ */
+#ifndef _GENERIC_ILOG2_H_
+#define _GENERIC_ILOG2_H_
+
+#include "brlib.h"
+
+/*
+ * See https://stackoverflow.com/a/11398748/3079831
+ */
+static const int __ilog2_32_table[32] = {
+    0,  9,  1, 10, 13, 21,  2, 29,
+    11, 14, 16, 18, 22, 25,  3, 30,
+    8, 12, 20, 28, 15, 17, 24,  7,
+    19, 27, 23,  6, 26,  5,  4, 31
+};
+
+static const int __ilog2_64_table[64] = {
+    63,  0, 58,  1, 59, 47, 53,  2,
+    60, 39, 48, 27, 54, 33, 42,  3,
+    61, 51, 37, 40, 49, 18, 28, 20,
+    55, 30, 34, 11, 43, 14, 22,  4,
+    62, 57, 46, 52, 38, 26, 32, 41,
+    50, 36, 17, 19, 29, 10, 13, 21,
+    56, 45, 25, 31, 35, 16,  9, 12,
+    44, 24, 15,  8, 23,  7,  6,  5
+};
+
+static __always_inline __const int __ilog2_32_emulated (u32 n)
+{
+    n |= n >> 1;
+    n |= n >> 2;
+    n |= n >> 4;
+    n |= n >> 8;
+    n |= n >> 16;
+    return __ilog2_32_table[(n*0x07C4ACDD) >> 27];
+}
+
+static __always_inline __const int __ilog2_64_emulated (u64 n)
+{
+    n |= n >> 1;
+    n |= n >> 2;
+    n |= n >> 4;
+    n |= n >> 8;
+    n |= n >> 16;
+    n |= n >> 32;
+    return __ilog2_64_table[((n - (n >> 1))*0x07EDD5E59A4E28C2LL) >> 58];
+}
+
+#endif /* _GENERIC_ILOG2_H_ */
--- a/include/bitops.h
+++ b/include/bitops.h
@@ -13,9 +13,14 @@
 #ifndef _BITS_H
 #define _BITS_H

-#include "br.h"
+#include "brlib.h"
 #include "bitops-emulated/generic-ctz.h"
 #include "bitops-emulated/generic-clz.h"
+#include "bitops-emulated/generic-bswap.h"
+
+#ifndef __has_builtin
+#define __has_builtin(x) 0
+#endif

 /* determine which native builtins are available
 */
@@ -31,7 +36,9 @@
 #if __has_builtin(__builtin_ffs)
 #   define HAS_FFS
 #endif
-
+#if __has_builtin(__builtin_bswap32)
+#   define HAS_BSWAP
+#endif

 /**
 * print_bitops_impl() - print bitops implementation.
@@ -41,10 +48,6 @@
 */
 void print_bitops_impl(void);

-#ifndef __has_builtin
-#define __has_builtin(x) 0
-#endif
-
 /* no plan to support 32bits for now...
 * #if __WORDSIZE != 64
 * #error "Only 64 bits word size supported."
@@ -52,8 +55,8 @@ void print_bitops_impl(void);
 */

 /**
- * lsb, msb: least/most significant bit: 10101000
- *                               msb = 7 ^   ^ lsb = 3
+ * lsb, msb: 0-indexed least/most significant bit: 10101000
+ *                                         msb = 7 ^   ^ lsb = 3
 *
 */
 #define lsb64(x) (ctz64(x))
@@ -63,7 +66,7 @@ void print_bitops_impl(void);

 /**
 * popcount32, popcout64 - count set bits:  10101000 -> 3
- * @num: unsigned 32 or 64 bits integer.
+ * @n: unsigned 32 or 64 bits integer.
 *
 */
 #if defined(HAS_POPCOUNT)
@@ -100,7 +103,7 @@ void print_bitops_impl(void);

 /**
 * ctz32, ctz64 - count trailing zeros: 00101000 -> 3
- * @num: unsigned 32 or 64 bits integer.
+ * @n: unsigned 32 or 64 bits integer.
 *
 * Not defined if no bit set, so check for non-zero before calling this.
 * This is similat the FFS (First Find Set), which has FFS(0) = 0.
@@ -127,7 +130,7 @@ void print_bitops_impl(void);
 /**
 * clz32, clz64 - count leading zeros: 00101000 -> 2
 *
- * @num: unsigned 32 or 64 bits integer.
+ * @n: unsigned 32 or 64 bits integer.
 *
 * Not defined if no bit set, so check for non-zero before calling this.
 */
@@ -144,8 +147,8 @@ void print_bitops_impl(void);

 /**
 * ffs32, ffs64 - find first bit set, indexed from 0: 00101000 -> 4
- * ffz32, ffz64 - find first bit unset, indexed from 0: 00101000 -> 0
- * @num: unsigned 32 or 64 bits integer.
+ * ffz32, ffz64 - find first bit unset, indexed from 0: 00101010 -> 2
+ * @n: unsigned 32 or 64 bits integer.
 *
 * ffs(n) is similar to ctz(n) + 1, but returns 0 if n == 0 (except
 * for ctz version, where ffs(0) is undefined).
@@ -174,22 +177,38 @@ void print_bitops_impl(void);
 #define ffz32(n)  ffs32(~(n))
 #define ffz64(n)  ffs64(~(n))

+/**
+ * bswap32, bswap64 - reverse bytes: 0x01020304 -> 0x04030201
+ * @n: unsigned 32 or 64 bits integer.
+ *
+ * ffs(n) is similar to ctz(n) + 1, but returns 0 if n == 0 (except
+ * for ctz version, where ffs(0) is undefined).
+ * ffz(n) is ffz(~n), with undefine value if n = 0.
+ */
+#if defined(HAS_BSWAP)
+#   define __bswap32_native(n)  __builtin_bswap32(n)
+#   define __bswap64_native(n)  __builtin_bswap64(n)
+#   define bswap32(n) __bswap32_native(n)
+#   define bswap64(n) __bswap64_native(n)
+#else
+#   define bswap32(n) __bswap32_emulated(n)
+#   define bswap64(n) __bswap64_emulated(n)
+#endif
+
 /**
 * fls32, fls64 - return one plus MSB index: 00101000 -> 6
- * @num: unsigned 32 or 64 bits integer.
+ * @n: unsigned 32 or 64 bits integer.
 *
 * Similar to nbits(n) - clz(n), but returns 0 if n == 0;
 */
 #define fls32(n) ((n)? 32 - clz32(n): 0)
 #define fls64(n) ((n)? 64 - clz64(n): 0)

-/* rolXX/rorXX are taken from kernel's <linux/bitops.h> are are:
- * SPDX-License-Identifier: GPL-2.0
- */
-/**
- * rol8, rol16, rol32, rol64 - rotate left
+/*
+ * rol32, rot64 - rotate left
 * @num: unsigned 8, 16, 32 or 64 bits integer
 * @n: bits to roll
+ * See: https://stackoverflow.com/a/31488147/3079831
 */
 #define rol8(num, n)  ((num << (n &  7)) | (num >> ((-n) &  7)))
 #define rol16(num, n) ((num << (n & 15)) | (num >> ((-n) & 15)))
@@ -207,11 +226,13 @@ void print_bitops_impl(void);
 #define ror64(num, n) ((num >> (n & 63)) | (num << ((-n) & 63)))

 /**
- * ilog2 - log base 2
+ * ilog2_32, ilog2_64 - log base 2
 * @n: unsigned 32 or 64 bits integer.
+ *
+ * Undefine value if n = 0.
 */
-#define ilog2_32(n) (fls32(n) - 1)
-#define ilog2_64(n) (fls64(n) - 1)
+#define ilog2_32(n) (msb32(n))
+#define ilog2_64(n) (msb64(n))

 /**
 * is_pow2() - check if number is a power of two
@@ -226,7 +247,7 @@ void print_bitops_impl(void);
 * bit_for_eachXX_ffs - iterate over an integer bits (1-indexed)
 * @pos:  int used as current bit
 * @tmp:  temp u64/u32 used as temporary storage
- * @ul:   u32/u64 to loop over
+ * @u:    u32/u64 to loop over
 *
 * Bits are 0-indexed from 0 with bit_for_each, and 1-indexed with
 * bits_for_each_ffs.
@@ -240,16 +261,16 @@ void print_bitops_impl(void);
 * This will display the position of each bit set in ul: 0, 1, 3, 7
 *
 */
-#define bit_for_each32(pos, tmp, ul)                 \
-    for (tmp = ul, pos = ctz32(tmp);                 \
+#define bit_for_each32(pos, tmp, u)                  \
+    for (tmp = u, pos = ctz32(tmp);                  \
         tmp;                                        \
         tmp ^= 1U << pos, pos = ctz32(tmp))
 #define bit_for_each64(pos, tmp, ul)                 \
    for (tmp = ul, pos = ctz64(tmp);                 \
         tmp;                                        \
         tmp ^= 1UL << pos, pos = ctz64(tmp))
-#define bit_for_each64_ffs(pos, tmp, ul)             \
-    for (tmp = ul, pos = ffs64(tmp);                 \
+#define bit_for_each64_ffs(pos, tmp, u)              \
+    for (tmp = u, pos = ffs64(tmp);                  \
         tmp;                                        \
         tmp &= (tmp - 1),  pos = ffs64(tmp))
 #define bit_for_each32_ffs(pos, tmp, ul)             \
--- a/include/brlib.h
+++ b/include/brlib.h
@@ -1,4 +1,4 @@
-/* br.h - misc macros.
+/* brlib.h - misc types/macros.
 *
 * Copyright (C) 2021-2024 Bruno Raoult ("br")
 * Licensed under the GNU General Public License v3.0 or later.
@@ -15,9 +15,10 @@
 * This header contains generic stuff.
 */

-#ifndef _BR_H
-#define _BR_H
+#ifndef _BRLIB_H
+#define _BRLIB_H

+#include <stdlib.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <bits/wordsize.h>                        /* defines __WORDSIZE: 32 or 64 */
@@ -88,6 +89,7 @@ typedef signed char schar;
 */
 #define __unused             __attribute__((__unused__))
 #define __used               __attribute__((__used__))
+#define __const              __attribute__((__const__))

 /* see https://lkml.org/lkml/2018/3/20/845 for explanation of this monster
 */
@@ -266,4 +268,4 @@ typedef signed char schar;
 	({ signed type __x = (x); __x < 0 ? -__x : __x; }), other)


-#endif  /* _BR_H */
+#endif  /* _BRLIB_H */
--- a/include/bug.h
+++ b/include/bug.h
@@ -1,68 +1,61 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _BR_BUG_H
-#define _BR_BUG_H
+/* bug.h - bug_on/warn_on/warn functions.
+ *
+ * Copyright (C) 2021-2024 Bruno Raoult ("br")
+ * Licensed under the GNU General Public License v3.0 or later.
+ * Some rights reserved. See COPYING.
+ *
+ * You should have received a copy of the GNU General Public License along with this
+ * program. If not, see <https://www.gnu.org/licenses/gpl-3.0-standalone.html>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later <https://spdx.org/licenses/GPL-3.0-or-later.html>
+ *
+ */
+
+#ifndef BUG_H
+#define BUG_H

 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <stdarg.h>
-#include "likely.h"
-#include "debug.h"

-/* BUG functions inspired by Linux kernel's <asm/bug.h>
- */
-
-#define panic() exit(0xff)
-
-/*
- * Don't use BUG() or BUG_ON() unless there's really no way out; one
- * example might be detecting data structure corruption in the middle
- * of an operation that can't be backed out of.  If the (sub)system
- * can somehow continue operating, perhaps with reduced functionality,
- * it's probably not BUG-worthy.
- *
- */
-#define BUG() do {                                                                      \
-        fprintf(stderr, "BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \
-        panic();                                                                        \
+#define bug_on_always(expr) do {                                      \
+        if (expr) {                                                   \
+            fprintf(stderr,                                           \
+                    "** BUG ON %s[%s:%d]: assertion '%s' failed.\n",  \
+                    __func__, __FILE__,__LINE__, #expr);                    \
+            abort();                                                  \
+            /* not reached */                                         \
+        }                                                             \
    } while (0)

-#define BUG_ON(condition) do { if (unlikely(condition)) BUG(); } while (0)
+#define warn(expr, args...) ({                                        \
+        int _ret = !!(expr);                                          \
+        if (_ret)                                                     \
+            fprintf(stderr, ##args);                                  \
+        _ret;                                                         \
+    })

-/*
- * WARN(), WARN_ON(), WARN_ON_ONCE, and so on can be used to report significant
- * issues that need prompt attention if they should ever appear at runtime.
- *
- * Do not use these macros when checking for invalid external inputs
- * (e.g. invalid system call arguments, or invalid data coming from
- * network/devices), and on transient conditions like ENOMEM or EAGAIN.
- * These macros should be used for recoverable kernel issues only.
- * For invalid external inputs, transient conditions, etc use
- * pr_err[_once/_ratelimited]() followed by dump_stack(), if necessary.
- * Do not include "BUG"/"WARNING" in format strings manually to make these
- * conditions distinguishable from kernel issues.
- *
- * Use the versions with printk format strings to provide better diagnostics.
- */
-#define __WARN() do {                                                      \
-        fprintf(stderr, "WARNING: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \
-    } while (0)
-
-#define __WARN_printf(arg...) do {              \
-        vfprintf(stderr, arg);                  \
-    } while (0)
-
-#define WARN_ON(condition) ({                   \
-            int __ret_warn_on = !!(condition);  \
-            if (unlikely(__ret_warn_on))        \
-		__WARN();                       \
-            unlikely(__ret_warn_on);            \
+#define warn_on_always(expr) ({                                       \
+            warn(expr,                                                \
+                 "** WARN ON %s[%s:%d]: assertion '%s' failed.\n",    \
+                 __func__, __FILE__,__LINE__, #expr);                       \
        })

-#define WARN(condition, format...) ({           \
-            int __ret_warn_on = !!(condition);  \
-            if (unlikely(__ret_warn_on))        \
-		__WARN_printf(format);          \
-            unlikely(__ret_warn_on);            \
-        })
+#ifdef BUG_ON

-#endif /* _BR_BUG_H */
+#define bug_on(expr)          bug_on_always(expr)
+
+#define warn_on(expr)         warn_on_always(expr)
+#define warn_on_or_eval(expr) warn_on(expr)
+
+#else
+
+#define bug_on(expr)
+
+#define warn_on(expr)
+#define warn_on_or_eval(expr) (expr)
+
+#endif  /* BUG_ON */
+
+#endif /* BUG_H */
--- a/include/debug.h
+++ b/include/debug.h
@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <stdbool.h>

-#include <br.h>
+#include "brlib.h"

 #define NANOSEC  1000000000                       /* nano sec in sec */
 #define MILLISEC 1000000                          /* milli sec in sec */
--- a/include/hash.h
+++ b/include/hash.h
@@ -10,7 +10,7 @@

 #include <asm/bitsperlong.h>

-#include "br.h"
+#include "brlib.h"
 #include "bitops.h"

 /*
--- a/include/pjwhash-inline.h
+++ b/include/pjwhash-inline.h
@@ -14,7 +14,7 @@
 #ifndef _PJWHASH_INLINE_H
 #define _PJWHASH_INLINE_H

-#include "br.h"
+#include "brlib.h"

 #define THREE_QUARTERS ((int) ((BITS_PER_INT * 3) / 4))
 #define ONE_EIGHTH     ((int) (BITS_PER_INT / 8))
--- a/include/pjwhash.h
+++ b/include/pjwhash.h
@@ -13,7 +13,7 @@
 #ifndef _PJWHASH_H
 #define _PJWHASH_H

-#include "br.h"
+#include "brlib.h"

 /**
 * unsigned int pjwhash - PJW hash function
--- a/include/plist.h
+++ b/include/plist.h
@@ -279,7 +279,7 @@ static inline int plist_node_empty(const struct plist_node *node)
 #ifdef CONFIG_DEBUG_PLIST
 # define plist_first_entry(head, type, member)          \
    ({                                                  \
-	WARN_ON(plist_head_empty(head));                \
+	warn_on(plist_head_empty(head));                \
 	container_of(plist_first(head), type, member);  \
    })
 #else
@@ -296,7 +296,7 @@ static inline int plist_node_empty(const struct plist_node *node)
 #ifdef CONFIG_DEBUG_PLIST
 # define plist_last_entry(head, type, member)           \
    ({                                                  \
-	WARN_ON(plist_head_empty(head));                \
+	warn_on(plist_head_empty(head));                \
 	container_of(plist_last(head), type, member);   \
    })
 #else
--- a/include/pool.h
+++ b/include/pool.h
@@ -17,7 +17,7 @@
 #include <stdint.h>
 #include <stddef.h>

-#include "br.h"
+#include "brlib.h"
 #include "list.h"

 #define POOL_NAME_LENGTH (16)                     /* max name length including trailing \0 */
--- a/scripts/env.sh
+++ b/scripts/env.sh
@@ -18,13 +18,15 @@

 if [[ ! -v _BRLIB_ENV_ ]]; then
    export _BRLIB_ENV_=1 BRLIB_ROOT LD_LIBRARY_PATH
-    BRLIB_SCRIPTDIR=$(realpath -L "$(dirname "${BASH_SOURCE[0]}")")
    BRLIB_ROOT=$(realpath -L "$(dirname "${BASH_SOURCE[0]}")/..")
-    BRLIB_LIBDIR="$BRLIB_ROOT/lib"
+
+    BRLIB_SCRIPTDIR="$BRLIB_ROOT/scripts"
    BRLIB_BINDIR="$BRLIB_ROOT/bin"
-    LD_LIBRARY_PATH="${BRLIB_LIBDIR}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
    PATH="$PATH:$BRLIB_BINDIR:$BRLIB_SCRIPTDIR"
+
+    BRLIB_LIBDIR="$BRLIB_ROOT/lib"
+    LD_LIBRARY_PATH="${BRLIB_LIBDIR}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
    #printf "R=%s L=%s LD=%s\n" "$BRLIB_ROOT" "$BRLIB_DIR" "$LD_LIBRARY_PATH"
-    unset BRLIB_LIBDIR BRLIB_BINDIR BRLIB_SCRIPTDIR
+    unset BRLIB_SCRIPTDIR BRLIB_BINDIR BRLIB_LIBDIR
    printf "brlib environment complete.\n"
 fi
--- a/scripts/submodules-upd.sh
+++ b/scripts/submodules-upd.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+git submodule update --remote --merge
--- a/src/list_sort.c
+++ b/src/list_sort.c
@@ -3,7 +3,7 @@
 /*
 * Taken from linux kernel: lib/list_sort.c
 */
-#include "br.h"
+#include "brlib.h"
 #include "list_sort.h"
 #include "list.h"
 #include "likely.h"
--- a/src/plist.c
+++ b/src/plist.c
@@ -32,7 +32,7 @@ static struct plist_head test_head;
 static void plist_check_prev_next(struct list_head *t, struct list_head *p,
 				  struct list_head *n)
 {
-    WARN(n->prev != p || p->next != n,
+    warn(n->prev != p || p->next != n,
         "top: %p, n: %p, p: %p\n"
         "prev: %p, n: %p, p: %p\n"
         "next: %p, n: %p, p: %p\n",
@@ -76,8 +76,8 @@ void plist_add(struct plist_node *node, struct plist_head *head)
    struct list_head *node_next = &head->node_list;

    plist_check_head(head);
-    WARN_ON(!plist_node_empty(node));
-    WARN_ON(!list_empty(&node->prio_list));
+    warn_on(!plist_node_empty(node));
+    warn_on(!list_empty(&node->prio_list));

    if (plist_head_empty(head))
        goto ins_node;
@@ -148,8 +148,8 @@ void plist_requeue(struct plist_node *node, struct plist_head *head)
    struct list_head *node_next = &head->node_list;

    plist_check_head(head);
-    BUG_ON(plist_head_empty(head));
-    BUG_ON(plist_node_empty(node));
+    bug_on(plist_head_empty(head));
+    bug_on(plist_node_empty(node));

    if (node == plist_last(head))
        return;
--- a/src/pool.c
+++ b/src/pool.c
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <errno.h>

-#include "br.h"
+#include "brlib.h"
 #include "list.h"
 #include "pool.h"
 #include "debug.h"
--- a/test/bitops-test.c
+++ b/test/bitops-test.c
@@ -14,183 +14,351 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "br.h"
+#include "brlib.h"
 #include "bitops.h"
-// #include "cutest/CuTest.h"
+#include "cutest/CuTest.h"

-static void test_popcount()
+static const struct test32_1 {
+    u32 t32;                                      /* input */
+    u32 bswap;
+    int popc;
+    int ctz;
+    int clz;
+    int ffs;
+    int ffz;
+    int fls;
+    int ilog2;
+    struct {
+        int size;
+        uchar bfe[32];
+    };
+} test32_1[] = {
+    { 0x00000000, 0x00000000, 0, 32, 32,  0, 1,  0,  0, /* sometimes undefined */
+      { 0, { 0 } } },
+    { 0xffffffff, 0xffffffff, 32,   0,  0,  1, 0, 32, 31,
+      { 32, { 0,  1,  2,  3,  4,  5,  6,  7, 8,  9, 10, 11, 12, 13, 14, 15,
+            16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 } } },
+    { 0x00000001, 0x01000000,  1,   0, 31,  1, 2,  1,  0,
+      { 1, { 0 } } },
+    { 0x80000000, 0x00000080,  1,  31,  0, 32, 1, 32, 31,
+      { 1, { 31 } } },
+    { 0x71800718, 0x18078071, 10,   3,  1,  4, 1, 31, 30,
+      /* 0111 0001 1000 0000 0000 0111 0001 1000 */
+      { 10, { 3, 4, 8, 9, 10, 23, 24, 28, 29, 30 } } },
+    { 0x07eeeef7, 0xf7eeee07, 22,   0,  5,  1, 4, 27, 26,
+      /* 0000 0111 1110 1110 1110 1110 0111 1111*/
+      { 22, { 0, 1, 2, 4, 5, 6, 7, 9, 10, 11, 13,
+            14, 15, 17, 18, 19, 21, 22, 23, 24, 25, 26 } } },
+};
+
+static const struct test64_1 {
+    u64 t64;                                      /* input */
+    u64 bswap;
+    int popc;                                     /* some values may be undefined */
+    int ctz;
+    int clz;
+    int ffs;
+    int ffz;
+    int fls;
+    int ilog2;
+    struct {
+        int size;
+        uchar bfe[64];
+    };
+} test64_1[] = {
+    { 0x0000000000000000, 0x0000000000000000,  0, 64, 64,  0, 1,  0,  0,
+      { 0, { 0 } } },
+    { 0xffffffffffffffff, 0xffffffffffffffff, 64,  0,  0,  1, 0, 64, 63,
+      { 64, { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+            16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+            32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+            48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63 } } },
+    { 0x0000000100000001, 0x0100000001000000,  2,  0, 31,  1, 2, 33, 32,
+      { 2, { 0, 32 } } },
+    { 0x8000000000000000, 0x0000000000000080,  1, 63,  0, 64, 1, 64, 63,
+      { 1, { 63 } } },
+    { 0x7180071871800718, 0x1807807118078071, 20,  3,  1,  4, 1, 63, 62,
+      /* 2 x 0111 0001 1000 0000 0000 0111 0001 1000 */
+      { 20, { 3, 4, 8, 9, 10, 23, 24, 28, 29, 30,
+            35, 36, 40, 41, 42, 55, 56, 60, 61, 62 } } },
+    { 0x07eeeef707eeeef7, 0xf7eeee07f7eeee07, 44,  0,  5,  1, 4, 59, 58 ,
+      /* 2 x 0000 0111 1110 1110 1110 1110 0111 1111*/
+      { 44, { 0, 1, 2, 4, 5, 6, 7, 9, 10, 11, 13,
+            14, 15, 17, 18, 19, 21, 22, 23, 24, 25, 26,
+            32, 33, 34, 36, 37, 38, 39, 41, 42, 43, 45,
+            46, 47, 49, 50, 51, 53, 54, 55, 56, 57, 58 } } },
+};
+
+static void cutest_popcount(CuTest *tc)
 {
-    u32 t32[] = { 0x0,   0x88000101,           0xffffffff           };
-    u64 t64[] = { 0x0ll, 0x8880000000000101LL, 0xffffffffffffffffll };
-
-    for (uint i = 0; i < ARRAY_SIZE(t32); ++i) {
-        printf("popcount32 (%#x): ", t32[i]);
-#       ifdef ___popcount32_native
-        printf("native:%d ", __popcount32_native(t32[i]));
-#       else
-        printf("native:XXX ");
-#       endif
-        printf("emulated:%d ", __popcount_emulated(t32[i]));
-        printf("\n");
+    for (uint i = 0; i < ARRAY_SIZE(test32_1); ++i) {
+        int res = popcount32(test32_1[i].t32);
+        CuAssertIntEquals(tc, test32_1[i].popc, res);
    }
-        printf("\n");
-    for (uint i = 0; i < ARRAY_SIZE(t64); ++i) {
-        printf("popcount64 (%#lx): ", t64[i]);
-#       ifdef ___popcount64_native
-        printf("native:%d ", __popcount64_native(t64[i]));
-#       else
-        printf("native:XXX ");
-#       endif
-        printf("emulated:%d ", __popcount_emulated(t64[i]));
-        printf("\n");
+    for (uint i = 0; i < ARRAY_SIZE(test64_1); ++i) {
+        int res = popcount64(test64_1[i].t64);
+        CuAssertIntEquals(tc, test64_1[i].popc, res);
    }
-    printf("\n");
 }

-static void test_ctz()
+static void cutest_ctz(CuTest *tc)
 {
-    u32 t32[] = {
-        0x88800101,
-        0xffffffff,
-        0x800,
-        0x80000000,
-        0x00800000
-    };
-    u64 t64[] = {
-        0x8880000000000101LL,
-        0xffffffffffffffffll,
-        0x800ll,
-        0x8000000000000000LL,
-        0x0080000000000000LL};
-
-    for (uint i = 0; i < ARRAY_SIZE(t32); ++i) {
-        printf("ctz32 (%#x): ", t32[i]);
-#       ifdef __ctz32_native
-        printf("native:%d ", __ctz32_native(t32[i]));
-#       else
-        printf("native:XXX ");
-#       endif
-        printf("emulated1:%d ", __ctz32_emulated(t32[i]));
-        printf("emulated2:%d ", __ctz32_emulated2(t32[i]));
-        //printf("emulated3:%d ", __ctz32_emulated3(t32[i]));
-        //printf("emulated4:%d ", __ctz32_emulated4(t32[i]));
-        printf("\n");
+    for (uint i = 0; i < ARRAY_SIZE(test32_1); ++i) {
+        int res = ctz32(test32_1[i].t32);
+        CuAssertIntEquals(tc, test32_1[i].ctz, res);
    }
-    printf("\n");
-    for (uint i = 0; i < ARRAY_SIZE(t64); ++i) {
-        printf("ctz64 (%#lx): ", t64[i]);
-#       ifdef __ctz64_native
-        printf("native:%d ", __ctz64_native(t64[i]));
-#       else
-        printf("native:XXX ");
-#       endif
-        printf("emulated1:%d ", __ctz64_emulated(t64[i]));
-        printf("emulated2:%d ", __ctz64_emulated2(t64[i]));
-        //printf("emulated3:%d ", __ctz64_emulated3(t64[i]));
-        //printf("emulated4:%d ", __ctz64_emulated4(t64[i]));
-        printf("\n");
+    for (uint i = 0; i < ARRAY_SIZE(test64_1); ++i) {
+        int res = ctz64(test64_1[i].t64);
+        //printf("t=%#llx r=%d e=%d\n", test64_1[i].t64, res, test64_1[i].ctz);
+        CuAssertIntEquals(tc, test64_1[i].ctz, res);
    }
-    printf("\n");
 }

-static void test_clz()
+static void cutest_clz(CuTest *tc)
 {
-    u32 t32[] = {
-        0x88800101,
-        0xffffffff,
-        0x800,
-        0x80000000,
-        0x00800000
-    };
-    u64 t64[] = {
-        0x8880000000000101LL,
-        0xffffffffffffffffll,
-        0x800ll,
-        0x8000000000000000LL,
-        0x0080000000000000LL};
-
-    for (uint i = 0; i < ARRAY_SIZE(t32); ++i) {
-        printf("clz32 (%#x): ", t32[i]);
-#       ifdef __clz32_native
-        printf("native:%d ", __clz32_native(t32[i]));
-#       else
-        printf("native:XXX ");
-#       endif
-        printf("emulated1:%d ", __clz32_emulated(t32[i]));
-        //printf("emulated2:%d ", __clz32_emulated2(t32[i]));
-        //printf("emulated3:%d ", __ctz32_emulated3(t32[i]));
-        //printf("emulated4:%d ", __ctz32_emulated4(t32[i]));
-        printf("\n");
+    for (uint i = 0; i < ARRAY_SIZE(test32_1); ++i) {
+        int res = clz32(test32_1[i].t32);
+        //printf("clz t=%#x r=%d e=%d\n", test32_1[i].t32, res, test32_1[i].clz);
+        CuAssertIntEquals(tc, test32_1[i].clz, res);
    }
-    printf("\n");
-    for (uint i = 0; i < ARRAY_SIZE(t64); ++i) {
-        printf("clz64 (%#lx): ", t64[i]);
-#       ifdef __clz64_native
-        printf("native:%d ", __clz64_native(t64[i]));
-#       else
-        printf("native:XXX ");
-#       endif
-        printf("emulated1:%d ", __clz64_emulated(t64[i]));
-        //printf("emulated2:%d ", __ctz64_emulated2(t64[i]));
-        //printf("emulated3:%d ", __ctz64_emulated3(t64[i]));
-        //printf("emulated4:%d ", __ctz64_emulated4(t64[i]));
-        printf("\n");
+    for (uint i = 0; i < ARRAY_SIZE(test64_1); ++i) {
+        int res = clz64(test64_1[i].t64);
+        //printf("clz t=%#llx r=%d e=%d\n", test64_1[i].t64, res, test64_1[i].clz);
+        CuAssertIntEquals(tc, test64_1[i].clz, res);
    }
-    printf("\n");
 }

-static void test_ffs()
+static void cutest_ffs(CuTest *tc)
 {
-    u32 t32[] = {
-        0x88800101,
-        0xffffffff,
-        0x800,
-        0x80000000,
-        0x00800000
-    };
-    u64 t64[] = {
-        0x8880000000000101LL,
-        0xffffffffffffffffll,
-        0x800ll,
-        0x8000000000000000LL,
-        0x0080000000000000LL};
+    for (uint i = 0; i < ARRAY_SIZE(test32_1); ++i) {
+        int res = ffs32(test32_1[i].t32);
+        CuAssertIntEquals(tc, test32_1[i].ffs, res);
+    }
+    for (uint i = 0; i < ARRAY_SIZE(test64_1); ++i) {
+        int res = ffs64(test64_1[i].t64);
+        //printf("ffs64 t=%#llx r=%d e=%d\n", test64_1[i].t64, res, test64_1[i].ffs);
+        CuAssertIntEquals(tc, test64_1[i].ffs, res);
+    }
+}

-    for (uint i = 0; i < ARRAY_SIZE(t32); ++i) {
-        printf("ffs32 (%#x): ", t32[i]);
-#       ifdef __ffs32_native
-        printf("native:%d ", __ffs32_native(t32[i]));
-#       else
-        printf("native:XXX ");
-#       endif
-        printf("popcount:%d ", __ffs32_popcount(t32[i]));
-        printf("ctz:%d ", __ffs32_ctz(t32[i]));
-        printf("emulated:%d ", __ffs32_emulated(t32[i]));
-        //printf("emulated4:%d ", __ctz32_emulated4(t32[i]));
-        printf("\n");
+static void cutest_ffz(CuTest *tc)
+{
+    for (uint i = 0; i < ARRAY_SIZE(test32_1); ++i) {
+        int res = ffz32(test32_1[i].t32);
+        //printf("ffz32 t=%#x r=%d e=%d\n", test32_1[i].t32, res, test32_1[i].ffz);
+        CuAssertIntEquals(tc, test32_1[i].ffz, res);
    }
-    printf("\n");
-    for (uint i = 0; i < ARRAY_SIZE(t64); ++i) {
-        printf("ffs64 (%#lx): ", t64[i]);
-#       ifdef __ffs64_native
-        printf("native:%d ", __ffs64_native(t64[i]));
-#       else
-        printf("native:XXX ");
-#       endif
-        printf("popcount:%d ", __ffs64_popcount(t64[i]));
-        printf("ctz:%d ", __ffs64_ctz(t64[i]));
-        printf("emulated:%d ", __ffs64_emulated(t64[i]));
-        //printf("emulated4:%d ", __ctz64_emulated4(t64[i]));
-        printf("\n");
+    for (uint i = 0; i < ARRAY_SIZE(test64_1); ++i) {
+        int res = ffz64(test64_1[i].t64);
+        //printf("ffz64 t=%#llx r=%d e=%d\n", test64_1[i].t64, res, test64_1[i].ffz);
+        CuAssertIntEquals(tc, test64_1[i].ffz, res);
    }
-    printf("\n");
-    printf("\n");
+}
+
+static void cutest_fls(CuTest *tc)
+{
+    for (uint i = 0; i < ARRAY_SIZE(test32_1); ++i) {
+        int res = fls32(test32_1[i].t32);
+        //printf("fls32 t=%#x r=%d e=%d\n", test32_1[i].t32, res, test32_1[i].fls);
+        CuAssertIntEquals(tc, test32_1[i].fls, res);
+    }
+    for (uint i = 0; i < ARRAY_SIZE(test64_1); ++i) {
+        int res = fls64(test64_1[i].t64);
+        //printf("fls64 t=%#llx r=%d e=%d\n", test64_1[i].t64, res, test64_1[i].fls);
+        CuAssertIntEquals(tc, test64_1[i].fls, res);
+    }
+}
+
+static void cutest_bswap(CuTest *tc)
+{
+    for (uint i = 0; i < ARRAY_SIZE(test32_1); ++i) {
+        int res = bswap32(test32_1[i].t32);
+        //printf("fls32 t=%#x r=%d e=%d\n", test32_1[i].t32, res, test32_1[i].fls);
+        CuAssertIntEquals(tc, test32_1[i].bswap, res);
+    }
+    for (uint i = 0; i < ARRAY_SIZE(test64_1); ++i) {
+        int res = bswap64(test64_1[i].t64);
+        //printf("fls64 t=%#llx r=%d e=%d\n", test64_1[i].t64, res, test64_1[i].fls);
+        CuAssertIntEquals(tc, test64_1[i].bswap, res);
+    }
+}
+
+static void cutest_ilog(CuTest *tc)
+{
+    for (uint i = 0; i < ARRAY_SIZE(test32_1); ++i) {
+        if (!test32_1[i].t32) {
+            //printf("ilog2_32 t=%#x skipped\n", test32_1[i].t32);
+            continue;
+        }
+        int res = ilog2_32(test32_1[i].t32);
+        //printf("ilog2_32_n t=%#x r=%d e=%d\n", test32_1[i].t32,
+        //       res, test32_1[i].ilog2);
+        CuAssertIntEquals(tc, test32_1[i].ilog2, res);
+    }
+    for (uint i = 0; i < ARRAY_SIZE(test64_1); ++i) {
+        if (!test64_1[i].t64) {
+            //printf("ilog2_32 t=%#llx skipped\n", test64_1[i].t64);
+            continue;
+        }
+        int res = ilog2_64(test64_1[i].t64);
+        //printf("ilog2_64_n t=%#llx r=%d e=%d\n", test64_1[i].t64,
+        //       res, test64_1[i].ilog2);
+        CuAssertIntEquals(tc, test64_1[i].ilog2, res);
+    }
+}
+
+static void cutest_bfe(CuTest *tc)
+{
+    char s[64];
+
+    for (uint i = 0; i < ARRAY_SIZE(test32_1); ++i) {
+        u32 tmp;
+        int cur, nb = 0;
+        char bfe_ffs[32];
+
+        /* create bit_for_each32_ffs values */
+        for (int j = 0; j < test32_1[i].size; ++j)
+            bfe_ffs[j] = test32_1[i].bfe[j] + 1;
+
+        bit_for_each32(cur, tmp, test32_1[i].t32) {
+            s[nb++] = cur;
+        }
+        CuAssertIntEquals(tc, test32_1[i].size, nb);
+        CuAssertMemEquals(tc, test32_1[i].bfe, s, test32_1[i].size);
+        nb = 0;
+        bit_for_each32_ffs(cur, tmp, test32_1[i].t32) {
+            s[nb++] = cur;
+        }
+        CuAssertMemEquals(tc, bfe_ffs, s, test32_1[i].size);
+    }
+
+    for (uint i = 0; i < ARRAY_SIZE(test64_1); ++i) {
+        u64 tmp;
+        int cur, nb = 0;
+        char bfe_ffs[64];
+
+        /* create bit_for_each64_ffs values */
+        for (int j = 0; j < test64_1[i].size; ++j)
+            bfe_ffs[j] = test64_1[i].bfe[j] + 1;
+
+        bit_for_each64(cur, tmp, test64_1[i].t64) {
+            s[nb++] = cur;
+        }
+        //printf("\n64 nb=%d size=%d\n", nb, test64_1[i].size);
+        CuAssertIntEquals(tc, test64_1[i].size, nb);
+        CuAssertMemEquals(tc, test64_1[i].bfe, s, test64_1[i].size);
+        nb = 0;
+        bit_for_each64_ffs(cur, tmp, test64_1[i].t64) {
+            s[nb++] = cur;
+        }
+        CuAssertMemEquals(tc, bfe_ffs, s, test64_1[i].size);
+    }
+}
+
+struct test32_2 {
+    u32 t32;                                      /* input */
+    u32 arg;
+    u32 rol;
+    u32 ror;
+    struct {
+        int size;
+        uchar bfe[32];
+    };
+} test32_2[] = {
+    { 0x00000000, 0,  0, 0,
+      {  0, { 0 }  } },
+    { 0x00000000, 1,  0, 0,
+      {  0, { 0 }  } },
+    { 0x10000001, 2,  0x40000004, 0x44000000,
+      {  2, { 0, 28 } } },
+    { 0x80000008, 3,  0x00000044, 0x10000001,
+      {  2, { 3, 31 } } },
+    { 0x71800718, 8,  0x80071871, 0x18718007,
+      { 10, { 3, 4, 8, 9, 10, 23, 24, 28, 29, 30 } } },
+    { 0x07eeeef7, 4,  0x7eeeef70, 0x707eeeef,
+      { 22, { 0, 1, 2, 4, 5, 6, 7, 9, 10,
+            11, 13, 14, 15, 17, 18, 19,
+            21, 22, 23, 24, 25, 26 } } },
+};
+
+struct test64_2 {
+    u64 t64;                                      /* input */
+    u32 arg;
+    u64 rol;
+    u64 ror;
+} test64_2[] = {
+    { 0x0000000000000000, 0,  0, 0 },
+    { 0x0000000000000000, 1,  0, 0 },
+    { 0x1000000110000001, 2,  0x4000000440000004, 0x4400000044000000 },
+    { 0x8000000880000008, 3,  0x0000004400000044, 0x1000000110000001 },
+    { 0x7180071871800718, 8,  0x8007187180071871, 0x1871800718718007 },
+    { 0x07eeeef707eeeef7, 4,  0x7eeeef707eeeef70, 0x707eeeef707eeeef }
+};
+
+static void cutest_rol(CuTest *tc)
+{
+    for (uint i = 0; i < ARRAY_SIZE(test32_2); ++i) {
+        u32 res = rol32(test32_2[i].t32, test32_2[i].arg);
+        //printf("rol32 t=%#x a=%u r=%#08x e=%#08x\n", test32_2[i].t32,
+        //       test32_2[i].arg, res, test32_2[i].rol);
+        CuAssertU32Equals(tc, test32_2[i].rol, res);
+    }
+    for (uint i = 0; i < ARRAY_SIZE(test64_2); ++i) {
+        u64 res = rol64(test64_2[i].t64, test64_2[i].arg);
+        //printf("rol64 t=%#llx a=%u r=%#08llx e=%#08llx\n", test64_2[i].t64,
+        //       test64_2[i].arg, res, test64_2[i].rol);
+        CuAssertU64Equals(tc, test64_2[i].rol, res);
+    }
+}
+
+static void cutest_ror(CuTest *tc)
+{
+    for (uint i = 0; i < ARRAY_SIZE(test32_2); ++i) {
+        u32 res = ror32(test32_2[i].t32, test32_2[i].arg);
+        //printf("ror32 t=%#x a=%u r=%#08x e=%#08x\n", test32_2[i].t32,
+        //       test32_2[i].arg, res, test32_2[i].ror);
+        CuAssertU32Equals(tc, test32_2[i].ror, res);
+    }
+    for (uint i = 0; i < ARRAY_SIZE(test64_2); ++i) {
+        u64 res = ror64(test64_2[i].t64, test64_2[i].arg);
+        //printf("ror64 t=%#0llx a=%u r=%#08llx e=%#08llx\n", test64_2[i].t64,
+        //       test64_2[i].arg, res, test64_2[i].ror);
+        CuAssertU64Equals(tc, test64_2[i].ror, res);
+    }
+}
+
+static CuSuite *bitops_GetSuite()
+{
+    CuSuite* suite = CuSuiteNew();
+    SUITE_ADD_TEST(suite, cutest_popcount);
+    SUITE_ADD_TEST(suite, cutest_ctz);
+    SUITE_ADD_TEST(suite, cutest_clz);
+    SUITE_ADD_TEST(suite, cutest_ffs);
+    SUITE_ADD_TEST(suite, cutest_ffz);
+    SUITE_ADD_TEST(suite, cutest_fls);
+    SUITE_ADD_TEST(suite, cutest_ilog);
+    SUITE_ADD_TEST(suite, cutest_bfe);
+    SUITE_ADD_TEST(suite, cutest_bswap);
+
+    SUITE_ADD_TEST(suite, cutest_rol);
+    SUITE_ADD_TEST(suite, cutest_ror);
+    return suite;
+}
+
+static void RunAllTests(void)
+{
+    CuString *output = CuStringNew();
+    CuSuite* suite = CuSuiteNew();
+    CuSuiteAddSuite(suite, bitops_GetSuite());
+
+    CuSuiteRun(suite);
+    CuSuiteSummary(suite, output);
+    CuSuiteDetails(suite, output);
+    printf("%s\n", output->buffer);
 }

 int main()
 {
-    test_popcount();
-    test_ctz();
-    test_clz();
-    test_ffs();
+    RunAllTests();
    exit(0);
 }
--- a/test/cutest
+++ b/test/cutest
--- a/test/pool-test.c
+++ b/test/pool-test.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "br.h"
+#include "brlib.h"
 #include "pool.h"
 #include "debug.h"
Author	SHA1	Message	Date
Bruno Raoult	180839c960	bug.h revamp, easier to use	2024-07-15 08:18:35 +02:00
Bruno Raoult	a48ebf9099	Makefile: add 'build=' option. bug.h: numeric {BUG,WARN}_ON	2024-07-10 07:34:05 +02:00
Bruno Raoult	553dc6bd07	del useless unlikely()	2024-06-23 07:32:22 +02:00
Bruno Raoult	7bedfddfba	allow bug.h re-inclusion	2024-05-18 13:30:46 +02:00
Bruno Raoult	8ff163dcf5	add stdlib in brlib.h (unexplained error in __abs_choose_expr)	2024-03-07 22:51:48 +01:00
Bruno Raoult	9162db31e3	add -DBUG_ON -DWARN_ON to enable/disable bug_on()/warn_on()	2024-02-26 19:09:15 +01:00
Bruno Raoult	24baf3524a	switch to -O3	2024-02-23 05:47:23 +01:00
Bruno Raoult	f9aec10459	add bswap32/bswap64	2024-02-13 19:37:18 +01:00
Bruno Raoult	0e9b25dd68	warn(): vprintf -> fprintf	2024-02-07 22:13:10 +01:00
Bruno Raoult	8cb08dacb3	fix bug() args	2024-02-07 19:29:49 +01:00
Bruno Raoult	e907c81b8b	lowercase bug() and warn() functions	2024-02-07 19:03:50 +01:00
Bruno Raoult	b637146095	br.h -> brlib.h	2024-02-05 14:08:28 +01:00
Bruno Raoult	635e4c8d9e	improve README, remove some Makefile compile output	2024-02-05 07:51:05 +01:00
Bruno Raoult	e55ac95301	fix (another) git URI	2024-01-13 15:57:55 +01:00
Bruno Raoult	2262cc7393	fix git https:// URI	2024-01-13 14:28:45 +01:00
Bruno Raoult	32fd923192	move cutest_bfe data to first set	2024-01-13 10:59:24 +01:00
Bruno Raoult	a8a82a3121	Makefile: fix bin generation	2024-01-13 10:58:08 +01:00
Bruno Raoult	5e88bad291	clearer install instructions	2024-01-13 10:57:22 +01:00
Bruno Raoult	f29821ee94	add generic-ilog2.h (for reference)	2024-01-13 10:56:48 +01:00
Bruno Raoult	142f2d44c6	change submodule URI to relative	2024-01-12 18:02:57 +01:00
Bruno Raoult	e49c35dde9	Add cutest submodule	2024-01-12 13:55:09 +01:00
Bruno Raoult	c2ad81b2b5	add CuTest / update README	2024-01-11 11:40:36 +01:00
Bruno Raoult	20e0c4d9fc	add COPYING, README, and Emacs' dir-locals file	2024-01-07 14:16:30 +01:00