Skip to content

Commit

Permalink
Minor fixes in man pages (#4176)
Browse files Browse the repository at this point in the history
  • Loading branch information
XVilka committed Feb 1, 2024
1 parent 9fa29c0 commit 838ea61
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 38 deletions.
60 changes: 29 additions & 31 deletions binrz/man/rz-asm.1
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
.Sh DESCRIPTION
This command is part of the Rizin project.
.Pp
This tool uses r_asm to assemble and disassemble files or hexpair strings. It supports a large list of architectures which can be listed using the \-L flag.
This tool uses RzAsm to assemble and disassemble files or hexpair strings. It supports a large list of architectures which can be listed using the \-L flag.
.Pp
.Bl -tag -width Fl
.It Fl a Ar arch
Expand Down Expand Up @@ -79,36 +79,34 @@ Use hex dwords instead of hex pairs when assembling
.It Fl w
Describe opcode
.El
.Sh different than filename
.Sh Directives
.Pp
.Bl -tag -width Fl
.It Fl .intel_syntax
Use intel syntax rather than att:w
.It Fl .att_syntax
Use ATT syntax rather than flu :w
dentify the region fof aslerrger
.It Fl string
dentify the region fof aslerrger
.It Fl .align
.It Fl .arch
.It Fl .arm
.It Fl .ascii
.It Fl .bits
.It Fl .data
.It Fl .equ
.It Fl .fill
.It Fl .glob
.It Fl .hex
.It Fl .int16
.It Fl .int32
.It Fl .int64
.It Fl .kernel
.It Fl .offset
.It Fl .org
.It Fl .os
.It Fl .short
.It Fl .text
.It Fl .thumb
.Bl -tag -width
.It Ic .intel_syntax
Use Intel syntax rather than AT&T
.It Ic .att_syntax
Use AT&T syntax rather than Intel
.It Ic string
.It Ic .align
.It Ic .arch
.It Ic .arm
.It Ic .ascii
.It Ic .bits
.It Ic .data
.It Ic .equ
.It Ic .fill
.It Ic .glob
.It Ic .hex
.It Ic .int16
.It Ic .int32
.It Ic .int64
.It Ic .kernel
.It Ic .offset
.It Ic .org
.It Ic .os
.It Ic .short
.It Ic .text
.It Ic .thumb
.El
.Sh EXAMPLES
.Pp
Expand All @@ -133,4 +131,4 @@ Disassemble opcode:
.Pp
pancake <[email protected]>.
.Pp
byteninjaa0.
byteninjaa0.
10 changes: 4 additions & 6 deletions binrz/man/rz-gg.1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.Dt RZ_GG 1
.Sh NAME
.Nm rz-gg
.Nd rizin frontend for r_egg, compile programs into tiny binaries for different architectures.
.Nd rizin frontend for RzEgg, compile programs into tiny binaries for different architectures.
.Sh SYNOPSIS
.Nm rz-gg
.Op Fl FOLsrxvhz
Expand All @@ -29,9 +29,7 @@
.Sh DESCRIPTION
This command is part of the Rizin project.
.Pp
This tool is experimental and is a rewrite of the old rarc2 and rarc2-tool programs as a library integrated with r_asm and r_bin.
.Pp
Programs generated by r_egg are relocatable and can be injected into a running process or on-disk binary file.
Programs generated by RzEgg are relocatable and can be injected into a running process or on-disk binary file.
.Pp
Since the rz-gg-cc merge, rz-gg can now generate shellcodes from C code. The final code can be linked with rz-bin, and it is relocatable, allowing injection into any remote process. This feature is conceptually based on shellforge4, but only supports Linux/OSX x86-32/64 platforms.
.Sh DIRECTIVES
Expand Down Expand Up @@ -104,7 +102,7 @@ Output in C string syntax
.Sh EXAMPLE
.Pp
$ cat hi.r
/* hello world in r_egg */
/* hello world in RzEgg */
write@syscall(4); //x64 write@syscall(1);
exit@syscall(1); //x64 exit@syscall(60);
.Pp
Expand Down Expand Up @@ -155,4 +153,4 @@ Output in C string syntax
.Pp
Written by pancake <[email protected]>.
.Pp
byteninjaa0.
byteninjaa0.
2 changes: 1 addition & 1 deletion librz/main/rz-asm.c
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ static int rasm_show_help(int v) {
"-s", "[syntax]", "Select syntax (intel, att)",
"-v", "", "Show version information",
"-x", "", "Use hex dwords instead of hex pairs when assembling.",
"-w", "", "What's this instruction for? describe opcode",
"-w", "", "Describe opcode",
// clang-format on
};
if (v != 1) {
Expand Down

0 comments on commit 838ea61

Please sign in to comment.