Skip to content

Commit d522148

Browse files
authored
Merge pull request #316 from riscv-non-isa/replace-C++-Cpp
Replace C++ with {Cpp}, ++ might confuse Asciidoc parsing in somecase.
2 parents 3b66b48 + 7a1e100 commit d522148

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

riscv-cc.adoc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@ Aggregates or scalars passed on the stack are aligned to the greater of the
125125
type alignment and XLEN bits, but never more than the stack alignment.
126126

127127
Aggregates larger than 2×XLEN bits are passed by reference and are replaced in
128-
the argument list with the address, as are C++ aggregates with nontrivial copy
128+
the argument list with the address, as are {Cpp} aggregates with nontrivial copy
129129
constructors, destructors, or vtables.
130130

131131
Empty structs or union arguments or return values are ignored by C compilers
132-
which support them as a non-standard extension. This is not the case for C++,
132+
which support them as a non-standard extension. This is not the case for {Cpp},
133133
which requires them to be sized types.
134134

135135
Bitfields are packed in little-endian fashion. A bitfield that would span the
@@ -207,7 +207,7 @@ For the purposes of this section, "struct" refers to a C struct with its
207207
hierarchy flattened, including any array fields. That is, `struct { struct
208208
{ float f[1]; } g[2]; }` and `struct { float f; float g; }` are
209209
treated the same. Fields containing empty structs or unions are ignored while
210-
flattening, even in C++, unless they have nontrivial copy constructors or
210+
flattening, even in {Cpp}, unless they have nontrivial copy constructors or
211211
destructors. Fields containing zero-length bit-fields are ignored while
212212
flattening. Attributes such as `aligned` or `packed` do not interfere with a
213213
struct's eligibility for being passed in registers according to the rules
@@ -347,16 +347,16 @@ document.
347347
Please refer to the documentation of the RISC-V execution environment interface
348348
(e.g OS kernel ABI, SBI).
349349

350-
== C/C++ type details
350+
== C/{Cpp} type details
351351

352-
=== C/C++ type sizes and alignments
352+
=== C/{Cpp} type sizes and alignments
353353

354-
There are two conventions for C/C++ type sizes and alignments.
354+
There are two conventions for C/{Cpp} type sizes and alignments.
355355

356356
ILP32, ILP32F, ILP32D, and ILP32E:: Use the following type sizes and
357357
alignments (based on the ILP32 convention):
358358
+
359-
.C/C++ type sizes and alignments for RV32
359+
.C/{Cpp} type sizes and alignments for RV32
360360
[cols="4,>2,>3"]
361361
[width=60%]
362362
|===
@@ -381,7 +381,7 @@ alignments (based on the ILP32 convention):
381381
LP64, LP64F, LP64D, and LP64Q:: Use the following type sizes and
382382
alignments (based on the LP64 convention):
383383
+
384-
.C/C++ type sizes and alignments for RV64
384+
.C/{Cpp} type sizes and alignments for RV64
385385
[cols="4,>2,>3"]
386386
[width=60%]
387387
|===
@@ -411,7 +411,7 @@ The alignment of `max_align_t` is 16.
411411
Structs and unions are aligned to the alignment of their most strictly aligned
412412
member. The size of any object is a multiple of its alignment.
413413

414-
=== C/C++ type representations
414+
=== C/{Cpp} type representations
415415

416416
`char` is unsigned.
417417

riscv-elf.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ stack space and hurt performance. This attribute allows vector registers to
141141
not be part of the standard calling convention so run-time linkers are not
142142
required to save/restore them and can instead eagerly bind such functions.
143143

144-
== C++ Name Mangling
144+
== {Cpp} Name Mangling
145145

146146
{Cpp} name mangling for RISC-V follows
147147
the _Itanium {Cpp} ABI_ <<itanium-cxx-abi>>;
@@ -1006,7 +1006,7 @@ is at the same position as a candidate relocation.
10061006
* [[[gabi]]] "Generic System V Application Binary Interface"
10071007
http://www.sco.com/developers/gabi/latest/contents.html
10081008

1009-
* [[[itanium-cxx-abi]]] "Itanium C++ ABI"
1009+
* [[[itanium-cxx-abi]]] "Itanium {Cpp} ABI"
10101010
http://itanium-cxx-abi.github.io/cxx-abi/
10111011

10121012
* [[[rv-asm]]] "RISC-V Assembly Programmer's Manual"

0 commit comments

Comments
 (0)