Skip to content

Commit

Permalink
Merge pull request #261 from riscv-non-isa/tweaks
Browse files Browse the repository at this point in the history
Minor grammar and style improvements
  • Loading branch information
kito-cheng authored Apr 14, 2022
2 parents d6a45d5 + ed0b6c2 commit 966a1ac
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions riscv-cc.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ endif::[]
In the standard ABI, procedures should not modify the integer registers tp and
gp, because signal handlers may rely upon their values.

The presence of a frame pointer is optional. If a frame pointer exists
it must reside in x8 (s0), the register remains callee-saved.
The presence of a frame pointer is optional. If a frame pointer exists,
it must reside in x8 (s0); the register remains callee-saved.

=== Floating-point Register Convention

Expand Down Expand Up @@ -100,7 +100,7 @@ available, the scalar is passed on the stack by value. If exactly one
register is available, the low-order XLEN bits are passed in the register and
the high-order XLEN bits are passed on the stack.

Scalars wider than 2×XLEN are passed by reference and are replaced in the
Scalars wider than 2×XLEN bits are passed by reference and are replaced in the
argument list with the address.

Aggregates whose total size is no more than XLEN bits are passed in
Expand Down Expand Up @@ -134,7 +134,7 @@ undefined.

Arguments passed by reference may be modified by the callee.

Floating-point reals are passed the same way as aggregates of the same size,
Floating-point reals are passed the same way as aggregates of the same size;
complex floating-point numbers are passed the same way as a struct containing
two floating-point reals. (This constraint changes when the integer calling
convention is augmented by the hardware floating-point calling convention.)
Expand Down Expand Up @@ -219,7 +219,7 @@ A struct containing just one floating-point real is passed as though it were
a standalone floating-point real.

A struct containing two floating-point reals is passed in two floating-point
registers, if neither is more than FLEN bits wide and at least two floating-point
registers, if neither real is more than FLEN bits wide and at least two floating-point
argument registers are available. (The registers need not be an aligned pair.)
Otherwise, it is passed according to the integer calling convention.

Expand Down
10 changes: 5 additions & 5 deletions riscv-elf.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ in the current code model.
=== Small code model

The small code model, or `medlow`, allows the code to address the whole RV32
address space or the lower 2 GiB and highest 2GiB of the RV64 address space
address space or the lower 2 GiB and highest 2 GiB of the RV64 address space
(`0xFFFFFFFF7FFFF800` ~ `0xFFFFFFFFFFFFFFFF` and `0x0` ~ `0x000000007FFFF7FF`).
By using the instructions `lui` and `ld` or `st`, when referring to an object, or
`addi`, when calculating an address literal, for example,
Expand Down Expand Up @@ -178,7 +178,7 @@ ELFDATA2MSB:::: Big-endian Object File
--

e_machine:: Identifies the machine this ELF file targets. Always contains
EM_RISCV (243) for RISC-V ELF files. We only support RISC-V v2 family ISAs,
EM_RISCV (243) for RISC-V ELF files. We only support RISC-V v2 family ISAs;
this support is implicit.

e_flags:: Describes the format of this ELF file. These flags are used by the
Expand Down Expand Up @@ -290,7 +290,7 @@ column is given below:

Enum:: The number of the relocation, encoded in the r_info field

ELF Reloc Type:: The name of the relocation, omitted the prefix of `R_RISCV_` here.
ELF Reloc Type:: The name of the relocation, omitting the prefix of `R_RISCV_`.

Type:: Whether the relocation is a static or runtime relocation:
+
Expand Down Expand Up @@ -523,7 +523,7 @@ The following assembly and relocations show loading an absolute address:
==== Global Offset Table

For position independent code in dynamically linked objects, each shared
object contains a GOT (Global Offset Table) which contains addresses of
object contains a GOT (Global Offset Table), which contains addresses of
global symbols (objects and functions) referred to by the dynamically
linked shared object. The GOT in each shared library is filled in by the
dynamic linker during program loading, or on the first call to extern functions.
Expand Down Expand Up @@ -823,7 +823,7 @@ In the Global Dynamic model, the runtime library provides the `__tls_get_addr` f
extern void *__tls_get_addr (tls_index *ti);
----

where the type tls index are defined as:
where the type tls_index is defined as:

[,c]
----
Expand Down

0 comments on commit 966a1ac

Please sign in to comment.