Skip to content

Commit 7f65af4

Browse files
committed
Address feedback from Quentin
Signed-off-by: Dave Thaler <[email protected]>
1 parent a119617 commit 7f65af4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

isa/kernel.org/instruction-set.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -516,15 +516,15 @@ BPF_IMM | BPF_DW | BPF_LD 0x18 0x1 dst = map_by_fd(imm) m
516516
BPF_IMM | BPF_DW | BPF_LD 0x18 0x2 dst = mva(map_by_fd(imm)) + next_imm map fd data pointer
517517
BPF_IMM | BPF_DW | BPF_LD 0x18 0x3 dst = variable_addr(imm) variable id data pointer
518518
BPF_IMM | BPF_DW | BPF_LD 0x18 0x4 dst = code_addr(imm) integer code pointer
519-
BPF_IMM | BPF_DW | BPF_LD 0x18 0x5 dst = mva(map_by_idx(imm)) map index map
519+
BPF_IMM | BPF_DW | BPF_LD 0x18 0x5 dst = map_by_idx(imm) map index map
520520
BPF_IMM | BPF_DW | BPF_LD 0x18 0x6 dst = mva(map_by_idx(imm)) + next_imm map index data pointer
521521
========================= ====== === ===================================== =========== ==============
522522

523523
where
524524

525525
* map_by_fd(fd) means to convert a 32-bit POSIX file descriptor into an address of a map object (see `Map objects`_)
526526
* map_by_index(index) means to convert a 32-bit index into an address of a map object
527-
* mva(map) gets the address of the memory region expressed by a given map object
527+
* mva(map) gets the address of the first value in a given map object
528528
* variable_addr(id) gets the address of a variable (see `Variables`_) with a given id
529529
* code_addr(offset) gets the address of the instruction at a specified relative offset in units of 64-bit blocks
530530
* the 'imm type' can be used by disassemblers for display
@@ -594,7 +594,7 @@ opcode src imm description referenc
594594
0x18 0x2 0x00 dst = mva(map_by_fd(imm)) + next_imm `64-bit immediate instructions`_
595595
0x18 0x3 0x00 dst = variable_addr(imm) `64-bit immediate instructions`_
596596
0x18 0x4 0x00 dst = code_addr(imm) `64-bit immediate instructions`_
597-
0x18 0x5 0x00 dst = mva(map_by_idx(imm)) `64-bit immediate instructions`_
597+
0x18 0x5 0x00 dst = map_by_idx(imm) `64-bit immediate instructions`_
598598
0x18 0x6 0x00 dst = mva(map_by_idx(imm)) + next_imm `64-bit immediate instructions`_
599599
0x1c any 0x00 dst = (uint32_t)(dst - src) `Arithmetic instructions`_
600600
0x1d any 0x00 if dst == src goto +offset `Jump instructions`_

0 commit comments

Comments
 (0)