Skip to content

Commit 223a8d5

Browse files
ryanmkurtzryanmkurtz
committed
Merge remote-tracking branch
'origin/GP-7073_dragonmacher_PR-9302_pgalbraith_manual-page-number' (Closes #9301, Closes #9302)
2 parents 13a308a + 4b1be46 commit 223a8d5

8 files changed

Lines changed: 353 additions & 85 deletions

File tree

‎Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/ListingBackground.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ <H3>Service</H3>
6262
<TR>
6363
<TD style="background-color: #DEE3E7;">
6464
<PRE>
65-
<CODE class="code">
65+
<CODE style="color: #778899;">
6666

6767
public void run() throws Exception {
6868
setBackgroundColor(anotherAddress, Color.YELLOW);
@@ -93,7 +93,7 @@ <H3>Service</H3>
9393
<TR>
9494
<TD style="background-color: #DEE3E7;">
9595
<PRE>
96-
<CODE class="code">
96+
<CODE style="color: #778899;">
9797

9898
public void run() throws Exception {
9999
ColorizingService service = state.getTool().getService(ColorizingService.class);

‎Ghidra/Features/Base/src/main/help/help/topics/ComputeChecksumsPlugin/Generate_Checksum_Help.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <H1>Checksum Generator</H1>
2121
<BLOCKQUOTE>
2222

2323
<!-- Group checksums together using color and indentation -->
24-
<DIV STYLE="background-color: #eeeeee;">
24+
<DIV STYLE="background-color: #eeeeee; color: black;">
2525

2626
<BLOCKQUOTE>
2727
<H3>Checksum-8</H3>
@@ -68,7 +68,7 @@ <H3><B>Checksum-32</B></H3>
6868

6969

7070
<!-- Group checksums together using color and indentation -->
71-
<DIV STYLE="background-color: #eeeeee;">
71+
<DIV STYLE="background-color: #eeeeee; color: black;">
7272

7373

7474
<H3>Adler-32</H3>
@@ -125,7 +125,7 @@ <H3><B>CRC-32</B></H3>
125125
<BLOCKQUOTE>
126126

127127
<!-- Group checksums together using color and indentation -->
128-
<DIV STYLE="background-color: #eeeeee;">
128+
<DIV STYLE="background-color: #eeeeee; color: black;">
129129

130130

131131
<H3><B>MD2</B></H3>

‎Ghidra/Features/Base/src/main/help/help/topics/ShowInstructionInfoPlugin/ShowInstructionInfo.htm‎

Lines changed: 179 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,14 @@ <H2><A name="Show_Processor_Manual"></A><B>Processor Manual</B></H2>
6969
<P align="center"><A name="Processor_Manual_Options"></A> <IMG src=
7070
"images/ProcessorManualOptions.png" border="0"></P>
7171

72+
73+
<BR>
74+
<BR>
75+
7276
<TABLE border="1">
7377
<TBODY>
7478
<TR>
75-
<TH width="20%">Options Name</TH>
79+
<TH width="25%">Options Name</TH>
7680

7781
<TH>Description</TH>
7882
</TR>
@@ -89,20 +93,190 @@ <H2><A name="Show_Processor_Manual"></A><B>Processor Manual</B></H2>
8993
<TR>
9094
<TD valign="top">Command Arguments</TD>
9195

92-
<TD>A space separated list of arguments that Ghidra will pass to the process listed
96+
<TD>
97+
98+
A space separated list of arguments that Ghidra will pass to the process listed
9399
above. If you need to include spaces as part of one of the arguments, then enclose the
94-
argument in double quotes (e.g., "arg with space").</TD>
100+
argument in double quotes (e.g., "arg with space").
101+
<BR><BR>
102+
The arguments will be passed to the process with the url as the last argument. The
103+
exception to this is if you use the ${FILENAME} variable. In that case, the file path
104+
will be passed where you placed it in the list of arguments.
105+
<BR><BR>
106+
Ghidra will process the following variables, if present:
107+
<UL>
108+
<LI>
109+
${FILENAME} - this will be replaced with the file path.
110+
</LI>
111+
<LI>
112+
${PAGE} - this will be replaced with the page number for the current
113+
instruction.
114+
</LI>
115+
</UL>
116+
</TD>
95117
</TR>
96118

97119
<TR>
98120
<TD valign="top">File Format</TD>
99121

100122
<TD>Ghidra will pass, by default, a URL to the given process. You may change this value
101-
to signal to Ghidra that it should pass a filename instead.</TD>
123+
to signal to Ghidra that it should pass a filename instead.
124+
125+
<UL>
126+
<LI>
127+
${HTTP_URL} - an http url suitable for a web browser. This will be a url
128+
that points to temp page that itself points to a file and page number of the
129+
instruction.
130+
</LI>
131+
<LI>
132+
${FILE_URL} - a file url that includes the page number of the instruction.
133+
</LI>
134+
<LI>
135+
${FILENAME} - the file path without the leading 'file:' protocol.
136+
</LI>
137+
</UL>
138+
139+
</TD>
102140
</TR>
103141
</TBODY>
104-
</TABLE><BR>
142+
</TABLE>
143+
<BR>
105144
<BR>
145+
146+
<H3>Examples</H3>
147+
<BLOCKQUOTE>
148+
<TABLE border="1" width="90%">
149+
<TBODY>
150+
<TR>
151+
<TH width="25%">Options Name</TH>
152+
<TH>Value</TH>
153+
</TR>
154+
155+
<TR>
156+
<TD valign="top" align="right">Command String</TD>
157+
158+
<TD>
159+
google-chrome
160+
</TD>
161+
</TR>
162+
163+
<TR>
164+
<TD valign="top" align="right">Command Arguments</TD>
165+
166+
<TD>
167+
168+
</TD>
169+
</TR>
170+
171+
<TR>
172+
<TD valign="top" align="right">File Format</TD>
173+
174+
<TD>
175+
${FILE_URL}
176+
</TD>
177+
</TR>
178+
<TR>
179+
<TD valign="top" align="right"><I>Result</I></TD>
180+
181+
<TD>
182+
<CODE>
183+
google-chrome file:/usr/local/manuals/processor.pdf#page=717
184+
</CODE>
185+
</TD>
186+
</TR>
187+
</TBODY>
188+
</TABLE>
189+
190+
<BR>
191+
<BR>
192+
<TABLE border="1" width="90%">
193+
<TBODY>
194+
<TR>
195+
<TH width="25%">Options Name</TH>
196+
<TH>Value</TH>
197+
</TR>
198+
199+
<TR>
200+
<TD valign="top" align="right">Command String</TD>
201+
202+
<TD>
203+
cmd.exe
204+
</TD>
205+
</TR>
206+
207+
<TR>
208+
<TD valign="top" align="right">Command Arguments</TD>
209+
<TD>
210+
/c start
211+
</TD>
212+
</TR>
213+
214+
<TR>
215+
<TD valign="top" align="right">File Format</TD>
216+
217+
<TD>
218+
${HTTP_URL}
219+
</TD>
220+
</TR>
221+
<TR>
222+
<TD valign="top" align="right"><I>Result</I></TD>
223+
224+
<TD>
225+
<CODE>
226+
cmd.exe /c start file:/tmp/user-ghidra/pdfView5915851125268369591.html
227+
</CODE>
228+
</TD>
229+
</TR>
230+
</TBODY>
231+
</TABLE>
232+
233+
234+
<BR>
235+
<BR>
236+
<TABLE border="1" width="90%">
237+
<TBODY>
238+
<TR>
239+
<TH width="25%">Options Name</TH>
240+
<TH>Value</TH>
241+
</TR>
242+
243+
<TR>
244+
<TD valign="top" align="right">Command String</TD>
245+
246+
<TD>
247+
C:\SumatraPDF.exe
248+
</TD>
249+
</TR>
250+
251+
<TR>
252+
<TD valign="top" align="right">Command Arguments</TD>
253+
<TD>
254+
-resuse-instance -page ${PAGE}
255+
</TD>
256+
</TR>
257+
258+
<TR>
259+
<TD valign="top" align="right">File Format</TD>
260+
261+
<TD>
262+
${FILENAME}
263+
</TD>
264+
</TR>
265+
<TR>
266+
<TD valign="top" align="right"><I>Result</I></TD>
267+
268+
<TD>
269+
<CODE>
270+
C:\SumatraPDF.exe -resuse-instance -page 67 processor.pdf
271+
</CODE>
272+
</TD>
273+
</TR>
274+
</TBODY>
275+
</TABLE>
276+
277+
<BR>
278+
<BR>
279+
</BLOCKQUOTE>
106280
</BLOCKQUOTE>
107281

108282
<H2><A name="Show_Instruction_Info_Window"></A><B>Instruction Info Window</B></H2>

0 commit comments

Comments
 (0)