Skip to content

Commit 8685f8d

Browse files
walkerkdwalkerkd
authored
Merge branch 'ARM-software:main' into master
2 parents 2f36d5e + 36280d2 commit 8685f8d

File tree

12 files changed

+470
-9
lines changed

12 files changed

+470
-9
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ jobs:
1212
uses: actions/setup-python@v5
1313
with:
1414
python-version: '3.x'
15+
- name: install libcairo-dev
16+
run: sudo apt install -y libcairo-dev
1517
- name: install packages
1618
run: pip install -r tools/rst2pdf/requirements.txt
1719
- name: check .rst document syntax

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ document | owner | Github handle
162162
[Morello Descriptor ABI for the Arm 64-bit Architecture](https://github.com/ARM-software/abi-aa/tree/master/descabi-morello) | Silviu Baranga | @sbaranga-arm
163163
[Memtag ABI Extension to ELF for the Arm 64-bit Architecture](https://github.com/ARM-software/abi-aa/tree/master/memtagabielf64) | Florian Mayer | @fmayer
164164
[C/C++ Atomics Application Binary Interface Standard for the Arm 64-bit Architecture](https://github.com/ARM-software/abi-aa/tree/master/atomicsabi64) | Luke Geeson | @lukeg101
165+
[AArch64 ELF Conventions for Binary Analysis](https://github.com/ARM-software/abi-aa/tree/main/baabielf64) | Pavel Iliin | @ilinpv
165166

166167
3. Merging the change
167168

‎atomicsabi64/atomicsabi64.rst‎

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,15 @@ Suggestions and improvements to this specification may be submitted to the:
379379
`issue tracker page on GitHub <https://github.com/ARM-software/abi-aa/issues>`_.
380380

381381

382+
Atomic types
383+
============
384+
385+
``_Atomic`` struct types types with size less than 16 bytes must be padded to the nearest power
386+
of 2. Their alignment must be the same as their size so that they can be used by atomic instructions.
387+
388+
``atomic_is_lock_free`` must return ``true`` for all ``_Atomic`` objects with size less than or equal
389+
to 16 bytes, and ``false`` otherwise.
390+
382391

383392
AArch64 atomic mappings
384393
=======================
@@ -399,10 +408,20 @@ Synchronization Fences
399408
+-----------------------------------------------------+--------------------------------------+
400409
| ``atomic_thread_fence(release)`` | .. code-block:: none |
401410
| | |
402-
| ``atomic_thread_fence(acq_rel)`` | DMB ISH |
411+
| | DMB ISHLD |
412+
| | DMB ISHST |
413+
| +--------------------------------------+
414+
| | .. code-block:: none |
403415
| | |
404-
| ``atomic_thread_fence(seq_cst)`` | |
405-
+-------------------------------------+---------------+--------------------------------------+
416+
| | DMB ISH |
417+
+-----------------------------------------------------+--------------------------------------+
418+
| ``atomic_thread_fence(acq_rel)`` | .. code-block:: none |
419+
| | |
420+
| ``atomic_thread_fence(seq_cst)`` | DMB ISH |
421+
+-----------------------------------------------------+--------------------------------------+
422+
423+
The release fence has two alternative implementations. Using ``DMB ISHLD`` and ``DMB ISHST``
424+
allows for more reordering since the combination is not a store-load barrier.
406425

407426
32-bit types
408427
------------
@@ -482,7 +501,7 @@ returned in ``W0``.
482501
| +---------------+--------------------------------------+
483502
| | ``FEAT_LSE`` | .. code-block:: none |
484503
| | | |
485-
| | | SWAL W2, W0, [X1] * |
504+
| | | SWPAL W2, W0, [X1] * |
486505
+-------------------------------------+---------------+--------------------------------------+
487506
| ``fetch_add(loc,val,relaxed)`` | ``Armv8-A`` | .. code-block:: none |
488507
| | | |
@@ -494,7 +513,7 @@ returned in ``W0``.
494513
| +---------------+--------------------------------------+
495514
| | ``FEAT_LSE`` | .. code-block:: none |
496515
| | | |
497-
| | | LDADD W0, W2, [X1] * |
516+
| | | LDADD W2, W0, [X1] * |
498517
+-------------------------------------+---------------+--------------------------------------+
499518
| ``fetch_add(loc,val,acquire)`` | ``Armv8-A`` | .. code-block:: none |
500519
| | | |
@@ -506,7 +525,7 @@ returned in ``W0``.
506525
| +---------------+--------------------------------------+
507526
| | ``FEAT_LSE`` | .. code-block:: none |
508527
| | | |
509-
| | | LDADDA W0, W2, [X1] * |
528+
| | | LDADDA W2, W0, [X1] * |
510529
+-------------------------------------+---------------+--------------------------------------+
511530
| ``fetch_add(loc,val,release)`` | ``Armv8-A`` | .. code-block:: none |
512531
| | | |
@@ -518,7 +537,7 @@ returned in ``W0``.
518537
| +---------------+--------------------------------------+
519538
| | ``FEAT_LSE`` | .. code-block:: none |
520539
| | | |
521-
| | | LDADDL W0, W2, [X1] * |
540+
| | | LDADDL W2, W0, [X1] * |
522541
+-------------------------------------+---------------+--------------------------------------+
523542
| ``fetch_add(loc,val,acq_rel)`` | ``Armv8-A`` | .. code-block:: none |
524543
| ``fetch_add(loc,val,seq_cst)`` | | |
@@ -530,7 +549,7 @@ returned in ``W0``.
530549
| +---------------+--------------------------------------+
531550
| | ``FEAT_LSE`` | .. code-block:: none |
532551
| | | |
533-
| | | LDADDAL W0, W2, [X1] * |
552+
| | | LDADDAL W2, W0, [X1] * |
534553
+-------------------------------------+---------------+--------------------------------------+
535554
| ``compare_exchange_strong(`` | ``Armv8-A`` | .. code-block:: none |
536555
| ``loc,exp,val,relaxed,relaxed)`` | | |
@@ -704,7 +723,7 @@ compare-exchange. The result is returned in ``X0`` and ``X1``.
704723
| +---------------+--------------------------------------+
705724
| |``FEAT_LRCPC3``| .. code-block:: none |
706725
| | | |
707-
| | | STILP x2, X3, [X4] |
726+
| | | STILP X2, X3, [X4] |
708727
+-------------------------------------+---------------+--------------------------------------+
709728
| ``load(loc,relaxed)`` | ``Armv8-A`` | .. code-block:: none |
710729
| | | |

‎baabielf64/Arm_logo_blue_RGB.svg‎

Lines changed: 15 additions & 0 deletions
Loading

‎baabielf64/CONTRIBUTIONS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Contributions to this project are licensed under an inbound=outbound
2+
model such that any such contributions are licensed by the contributor
3+
under the same terms as those in the LICENSE file.

‎baabielf64/LICENSE‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
This work is licensed under the Creative Commons
2+
Attribution-ShareAlike 4.0 International License. To view a copy of
3+
this license, visit http://creativecommons.org/licenses/by-sa/4.0/ or
4+
send a letter to Creative Commons, PO Box 1866, Mountain View, CA
5+
94042, USA.
6+
7+
Grant of Patent License. Subject to the terms and conditions of this
8+
license (both the Public License and this Patent License), each
9+
Licensor hereby grants to You a perpetual, worldwide, non-exclusive,
10+
no-charge, royalty-free, irrevocable (except as stated in this
11+
section) patent license to make, have made, use, offer to sell, sell,
12+
import, and otherwise transfer the Licensed Material, where such
13+
license applies only to those patent claims licensable by such
14+
Licensor that are necessarily infringed by their contribution(s) alone
15+
or by combination of their contribution(s) with the Licensed Material
16+
to which such contribution(s) was submitted. If You institute patent
17+
litigation against any entity (including a cross-claim or counterclaim
18+
in a lawsuit) alleging that the Licensed Material or a contribution
19+
incorporated within the Licensed Material constitutes direct or
20+
contributory patent infringement, then any licenses granted to You
21+
under this license for that Licensed Material shall terminate as of
22+
the date such litigation is filed.

‎baabielf64/README.md‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<div align="center">
2+
<img src="Arm_logo_blue_RGB.svg" />
3+
</div>
4+
5+
# AArch64 ELF Conventions for Binary Analysis
6+
7+
## About this document
8+
9+
The [AArch64 ELF Conventions for Binary Analysis](baabielf64.rst) specifies code-patterns recognised by Binary Analysis tools.
10+
11+
## About the license
12+
13+
As identified more fully in the [LICENSE](LICENSE) file, this project
14+
is licensed under CC-BY-SA-4.0 along with an additional patent
15+
license. The language in the additional patent license is largely
16+
identical to that in Apache-2.0 (specifically, Section 3 of Apache-2.0
17+
as reflected at https://www.apache.org/licenses/LICENSE-2.0) with two
18+
exceptions.
19+
20+
First, several changes were made related to the defined terms so as to
21+
reflect the fact that such defined terms need to align with the
22+
terminology in CC-BY-SA-4.0 rather than Apache-2.0 (e.g., changing
23+
“Work” to “Licensed Material”).
24+
25+
Second, the defensive termination clause was changed such that the
26+
scope of defensive termination applies to “any licenses granted to
27+
You” (rather than “any patent licenses granted to You”). This change
28+
is intended to help maintain a healthy ecosystem by providing
29+
additional protection to the community against patent litigation
30+
claims.
31+
32+
## Defects report
33+
34+
Please report defects in the [AArch64 ELF Conventions for Binary Analysis](baabielf64.rst) to the [issue tracker page on
35+
GitHub](https://github.com/ARM-software/abi-aa/issues).

‎baabielf64/TRADEMARK_NOTICE‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
The text of and illustrations in this document are licensed
2+
under a Creative Commons Attribution–Share Alike 4.0 International
3+
license ("CC-BY-SA-4.0”), with an additional clause on patents.
4+
The Arm trademarks featured here are registered trademarks or
5+
trademarks of Arm Limited (or its subsidiaries) in the US and/or
6+
elsewhere. All rights reserved. Please visit
7+
https://www.arm.com/company/policies/trademarks for more information
8+
about Arm’s trademarks.

0 commit comments

Comments
 (0)