Skip to content

Commit

Permalink
(chore) Change markup samples for armasm comments
Browse files Browse the repository at this point in the history
User requested the issue example code they provided not be used verbatim.

Closes #2411.
  • Loading branch information
joshgoebel committed Feb 19, 2020
1 parent 38c7ba9 commit effa09a
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 48 deletions.
37 changes: 13 additions & 24 deletions test/markup/armasm/default.expect.txt
@@ -1,24 +1,13 @@
<span class="hljs-comment">//=================== YOUR CODE GOES IN THE SECTION BELOW ===================//</span>

<span class="hljs-comment"># check for and handle zero</span>
<span class="hljs-keyword">orr</span> <span class="hljs-built_in">r1</span>, <span class="hljs-built_in">r0</span>, <span class="hljs-number">#128</span> <span class="hljs-comment">// r1 = r0 | 128</span>
<span class="hljs-keyword">cmp</span> <span class="hljs-built_in">r1</span>, <span class="hljs-number">#128</span> <span class="hljs-comment">// if r1 == 128 {</span>
<span class="hljs-keyword">bne</span> notZero <span class="hljs-comment">// .</span>
<span class="hljs-keyword">bl</span> zeroQuidFP2float <span class="hljs-comment">// zeroQuidFP2float() }</span>
<span class="hljs-keyword">b</span> <span class="hljs-meta">end</span> <span class="hljs-comment">// else {</span>

<span class="hljs-symbol">notZero:</span> <span class="hljs-comment">// .</span>
<span class="hljs-comment"># extract fields from quidfp</span>
<span class="hljs-keyword">and</span> <span class="hljs-built_in">r1</span>, <span class="hljs-built_in">r0</span>, <span class="hljs-number">#128</span> <span class="hljs-comment">// r1 = r0 &amp; 128 // sign</span>
<span class="hljs-keyword">and</span> <span class="hljs-built_in">r2</span>, <span class="hljs-built_in">r0</span>, <span class="hljs-number">#112</span> <span class="hljs-comment">// r2 = r0 &amp; 112 // exponent</span>
<span class="hljs-keyword">and</span> <span class="hljs-built_in">r3</span>, <span class="hljs-built_in">r0</span>, <span class="hljs-number">#15</span> <span class="hljs-comment">// r3 = r0 &amp; 15 // mantissa</span>

<span class="hljs-comment">// ...</span>

<span class="hljs-comment"># combine into r0</span>
<span class="hljs-keyword">orr</span> <span class="hljs-built_in">r0</span>, <span class="hljs-built_in">r1</span>, <span class="hljs-built_in">r2</span> <span class="hljs-comment">// r0 = r1 | r2</span>
<span class="hljs-keyword">orr</span> <span class="hljs-built_in">r0</span>, <span class="hljs-built_in">r0</span>, <span class="hljs-built_in">r3</span> <span class="hljs-comment">// r0 = r0 | r3 }</span>

<span class="hljs-symbol">end:</span> <span class="hljs-comment">// return r0</span>

<span class="hljs-comment">//===========================================================================//</span>
<span class="hljs-comment">//=================== YOUR CODE GOES HERE ===================//</span>

<span class="hljs-comment"># logical operator demo (highlight.js arm comment test)</span>
<span class="hljs-keyword">mov</span> <span class="hljs-built_in">r0</span>, <span class="hljs-number">#0x00F0</span> <span class="hljs-comment">// r0 = 0x00F0</span>
<span class="hljs-keyword">mov</span> <span class="hljs-built_in">r1</span>, <span class="hljs-number">#0x000F</span> <span class="hljs-comment">// r1 = 0x000F</span>
<span class="hljs-keyword">mov</span> <span class="hljs-built_in">r2</span>, <span class="hljs-number">#0xFF00</span> <span class="hljs-comment">// r2 = 0xFF00</span>

<span class="hljs-comment"># and even more code, but indented</span>
<span class="hljs-keyword">orr</span> <span class="hljs-built_in">r3</span>, <span class="hljs-built_in">r0</span>, <span class="hljs-built_in">r1</span> <span class="hljs-comment">// r3 = r0 | r1 // r3 = 0x00FF</span>
<span class="hljs-keyword">and</span> <span class="hljs-built_in">r4</span>, <span class="hljs-built_in">r3</span>, <span class="hljs-built_in">r2</span> <span class="hljs-comment">// r4 = r3 &amp; r2 // r4 = 0x0000</span>
<span class="hljs-keyword">orr</span> <span class="hljs-built_in">r5</span>, <span class="hljs-built_in">r3</span>, <span class="hljs-built_in">r2</span> <span class="hljs-comment">// r4 = r3 | r2 // r5 = 0xFFFF</span>
<span class="hljs-keyword">eor</span> <span class="hljs-built_in">r6</span>, <span class="hljs-built_in">r5</span>, <span class="hljs-built_in">r2</span> <span class="hljs-comment">// r6 = r5 ^ r2 // r6 = 0x00FF</span>
<span class="hljs-comment">//===========================================================================//</span>
37 changes: 13 additions & 24 deletions test/markup/armasm/default.txt
@@ -1,24 +1,13 @@
//=================== YOUR CODE GOES IN THE SECTION BELOW ===================//

# check for and handle zero
orr r1, r0, #128 // r1 = r0 | 128
cmp r1, #128 // if r1 == 128 {
bne notZero // .
bl zeroQuidFP2float // zeroQuidFP2float() }
b end // else {

notZero: // .
# extract fields from quidfp
and r1, r0, #128 // r1 = r0 & 128 // sign
and r2, r0, #112 // r2 = r0 & 112 // exponent
and r3, r0, #15 // r3 = r0 & 15 // mantissa

// ...

# combine into r0
orr r0, r1, r2 // r0 = r1 | r2
orr r0, r0, r3 // r0 = r0 | r3 }

end: // return r0

//===========================================================================//
//=================== YOUR CODE GOES HERE ===================//

# logical operator demo (highlight.js arm comment test)
mov r0, #0x00F0 // r0 = 0x00F0
mov r1, #0x000F // r1 = 0x000F
mov r2, #0xFF00 // r2 = 0xFF00

# and even more code, but indented
orr r3, r0, r1 // r3 = r0 | r1 // r3 = 0x00FF
and r4, r3, r2 // r4 = r3 & r2 // r4 = 0x0000
orr r5, r3, r2 // r4 = r3 | r2 // r5 = 0xFFFF
eor r6, r5, r2 // r6 = r5 ^ r2 // r6 = 0x00FF
//===========================================================================//

0 comments on commit effa09a

Please sign in to comment.