From 89091a2f84e7adb78f0046cf178701b0c211b21f Mon Sep 17 00:00:00 2001 From: Cody Gray Date: Wed, 3 May 2017 04:59:32 -0500 Subject: [PATCH] Add support for x86 assembly language. Adds a "lang-x86.js" lexer that enables syntax highlighting for Intel x86 assembly language. This language handler supports both Intel/MASM and AT&T/GAS syntax, and calls itself "x86" (not the somewhat more obvious "asm", since there are other architectures with their own assembly languages that this library may eventually want to support, also). Also added a few rudimentary tests. I have a more complete test harness for this, but I didn't want to overload the standard tests. Comprehensively testing this language module is difficult, because it needs to support so many different styles of syntax. (These could be broken up into different modules, but I prefer having them all under one heading for the convenience of the user at the expense of some difficulty and/or complexity in the implementation.) Note that the regexes have been heavily optimized, particularly those for matching the vast array of instruction mnemonics. Although this had the unfortunate effect of obfuscating the code, the Safari web inspector shows it cut the render time in half. --- README.md | 1 + src/lang-x86.js | 133 ++++++++++++++++++++++++++++++++++ tests/prettify_test_2.html | 143 +++++++++++++++++++++++++++++++++++++ tests/prettify_test_2.js | 136 ++++++++++++++++++++++++++++++++++- 4 files changed, 412 insertions(+), 1 deletion(-) create mode 100755 src/lang-x86.js diff --git a/README.md b/README.md index 774adaab..34510a2c 100644 --- a/README.md +++ b/README.md @@ -87,6 +87,7 @@ Other languages are supported via extensions: [Visual Basic](src/lang-vb.js); [VHDL](src/lang-vhdl.js); [Wiki](src/lang-wiki.js); +[x86 Assembly](src/lang-x86.js); [XQ](src/lang-xq.js); [YAML](src/lang-yaml.js) diff --git a/src/lang-x86.js b/src/lang-x86.js new file mode 100755 index 00000000..56bbf884 --- /dev/null +++ b/src/lang-x86.js @@ -0,0 +1,133 @@ +/** + * @license + * Copyright (C) 2017 Cody Gray + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @fileoverview + * Registers a language handler for x86 assembly language + * supporting both Intel/MASM and AT&T/GAS syntax. + * + * The highlighting focuses on constructs likely to be found in typical code samples. + * Some of the more esoteric syntax and unique features of the various x86 assemblers + * are not supported. All constructs are matched without respect to case. Generally, + * only valid instructions will be highlighted, but there are a few exceptions that + * have been made for convenience of implementation (see specific notes below). + * + * The authoritative documentation for the registers and instruction mnemonics is + * the "Intel IA-32 Architecture Software Developer's Manual", available online at: + * + * Documentation for Microsoft's assembler (MASM) is available online at: + * + * Documentation for the GNU assembler 'as' (GAS) is available online at: + * + * + * The largely obsolete AMD 3DNow! instruction set is not explicitly supported. + * Other obscure, vendor-specific, and/or newly-released x86 instruction set + * extensions are also not (yet) supported. All of the common instructions should + * be here, though, and additions to this file are encouraged if you find that + * something you need is missing! + * + * To use, include 'prettify.js' and this file in your HTML page. + * Then, put your code in an HTML tag like: + * 
...
+ * + * @author cody@codygray.com + */ + +PR['registerLangHandler']( + PR['createSimpleLexer']([], [ + // Comments begin with either ';' (Intel/MASM) or '#' (AT&T/GAS), + // and extend all the way to the end of that line. + [PR['PR_COMMENT'], /^[;#].*/], + + // String & character literals. + [PR['PR_STRING'], /^"[^"\\]*(?:\\.[^"\\]*)*"/], // double quotation marks + [PR['PR_STRING'], /^'[^'\\]*(?:\\.[^'\\]*)*'/], // single quotation marks + + // Instruction mnemonics will be like "names" for attributes. + // Unfortunately, regular expressions don't help us much here: we have to exhaustively + // enumerate every possibility. We do, however, use a regex to match AT&T/GAS's suffixes, + // albeit at the risk of matching some invalid instructions (e.g., outsq, popq, popfdq, + // fisttpb, etc., as well as those with alternate encodings in Intel vs. AT&T syntax). + // [Base] + [PR['PR_ATTRIB_NAME'], /^\s(?:a(?:a[adms]|d[cd]|nd|rpl)|b(?:ound|s(?:f|r|wap)|t[crs]?)|c(?:all|bw|wde?|dq|l(?:ac|c|d|i|ts?)|flush|m(?:c|p(?:s[bwd]?|xchg(?:486|8b)?)?)|puid)|d(?:a[as]|ec)|e(?:nter|sc)|fatret|hlt|i(?:bts|cebp|n(?:c|s[bwd]?|to?|v(?:d|lpg|pcid))?|ret(?:df?|f|w)?)|i?(?:div|mul)|l(?:a(?:hf|r)|ds|e(?:a(?:ve)?|s)|fs|g(?:dt|s)|[i|l]dt|msw|o(?:adall(?:d|286|386)?|ck|ds[bwd]?|op(?:d|w|n?ed?|n?ew|n?zd?|n?zw)?)|s[ls]|tr)|mov(?:be|s(?:bw?|w|d|x|lq)?|z(?:x|[wb]l))?|n(?:eg|o[pt])|o(?:r|ut(?:s[bwd]?)?)|p(?:ush|op)(?:a[wd]?|f[wd]?)?|r(?:c[lr]|d(?:msr|pmc|shr|tsc)|e(?:p(?:n?e|n?z)?|t[fn]?)|o[lr]|s(?:dc|ldt|m|ts))|s(?:a(?:hf|lc?|r)|cas[bwd]?|gdt|h[lr]d?|[il]dt|m(?:i(?:nt(?:old)?)?|sw)|t(?:a?c|d|i|os[bwds]?|r)|[ub]b|v(?:dc|ldt|ts)|ys(?:call|enter|exit|ret))|test|u(?:d[0-2]|mov)|ver[rw]|w(?:ait|binvd|r(?:ms|sh)r)|x(?:add|bts|chg|latb?|or|save(?:opt)?|rstor))[bwlq]?\b/i], + // [Base, x86-64] + [PR['PR_ATTRIB_NAME'], /^\s(?:c(?:dqe|qo|mp(?:sq|xchg16))|iretq|lodsq|movsxd|p(?:op|ush)fq|rdtscp|s(?:casq|tosq|wapgs))[bwlq]?\b/i], + // [Jumps/Branches] + [PR['PR_ATTRIB_NAME'], /^\sj(?:mp|[re]?cxz|n?o|n?s|n?e|n?z|n?[ab]e?|n?c|n?le?|n?ge?|p[eo]?|np)\b/i], + // [Other conditional instructions] + [PR['PR_ATTRIB_NAME'], /^\s(?:set|cmov)(?:n?o|n?s|n?e|n?z|n?[ab]e?|n?c|n?le?|n?ge?|p[eo]?|np)[bwlq]?\b/i], + [PR['PR_ATTRIB_NAME'], /^\sfcmovn?(?:be?|e|u)\b/i], + // [x87 FPU] + [PR['PR_ATTRIB_NAME'], /^\sf(?:2xm1|a(?:bs|ddp?)|bld|(?:b|dec)stp|c[ho]s|u?com(?:ip?|pp?)?|div(?:p|rp?)?|freep?|i(?:add|comp?|divr?|ld|mul|n(?:cstp|it)|s(?:tp?|ubr?))|ld(?:1|cw|env[wd]?|l(?:2[et]|[gn]2)|pi|z)?|mulp?|n?(?:clex|disi|eni)|n(?:init|op|s(?:ave[wd]?|t(?:cw|env[wd]?|sw)))|p(?:rem1?|a?tan)|r(?:ndint|stor[wd]?)|s(?:ave[wd]?|cale|etpm|in(?:cos)?|qrt|t(?:cw|env[wd]?|p|sw)?|ub(?:p|rp?)?)|tst|wait|x(?:am|ch|tract)|yl2x(?:p1)?)[slqt]?\b/i], + // [MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2 -- no 'v' prefix] + [PR['PR_ATTRIB_NAME'], /^\s(?:(?:c(?:lflush|vt(?:p(?:[sd]2pi|i2p[sd])|tp[sd]2pi)|rc32)|f(?:isttp|x(?:rstor|save)(?:64)?)|movnt(?:i|s[sd]|q)|p(?:avg[bw]|(?:ext|ins)rw|m(?:(?:ax|in)(?:sw|ub)|ulhuw)|opcnt|s(?:adbw|hufw)|refetch(?:w?(?:t[0-2])?|nta)?))[bwlq]?|(?:f?emms|p(?:ause|movmskb)|m(?:askmovq|o(?:nitor|v(?:dq2q|q2dq))|wait)|[mls]fence))\b/i], + // [AVX & AVX2 -- 'v' prefix] + [PR['PR_ATTRIB_NAME'], /^\sv(?:broadcast(?:s[sd]|[fi]128)|cmp(?:n?eq_[ou][sq]|g[et](?:_oq)?|ng[et](?:_uq)?|l[et]_oq|nl[et]_uq|(?:un)?ord_s|true(?:_us)?|false(?:_os)?)[sp][sd]|(?:extract|insert)[fi]128|gather(?:dq?|q)(?:p[sd]|[dq])|p(?:b(?:lendd|roadcast)|gather[dq]{2}|erm(?:2[fi]128|il(?:(?:m[oz]|td)?2)?p[sd]|d|q|p[sd])|maskmov[dq]|s(?:llv[dq]|r(?:avd|lv[dq])))|m(?:askmovp[sd]|ov(?:ntqq|qq[au]))|testp[sd]|zero(?:all|upper))[bwlq]?\b/i], + // [SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX, AVX2, & AES -- optional 'v' prefix] + [PR['PR_ATTRIB_NAME'], /^\sv?(?:(?:a(?:es(?:dec(?:last)?|enc(?:last)?|imc|keygenassist)|(?:dd(?:p|s(?:ubp)?)|ndn?p)[sd])|blendv?p[sd]|u?comis[sd]|c(?:mp(?:n?eq|n?l[et]|(?:un)?ord)?[sp][sd]|vt(?:dq2p[sd]|p(?:d2(?:dq|ps)|s2(?:dq|pd))|s(?:d2s[is]|i2s[sd]|s2s[id])|t(?:p[sd]2dq|s[sd]2si)))|d(?:iv[sp]|pp)[sd]|insert(?:ps|q)|extr(?:actps|q)|h(?:add|sub)p[sd]|ld(?:[dq]qu|mxcsr)|m(?:(?:ax|in|ul)[sp][sd]|ov(?:ap[sd]|d(?:dup)?|[hl]p[sd]|s(?:[sd]|[hl]dup)|up[sd]|(?:dq[au]|mskp[sd]|nt(?:dqa?|p[sd])|q))|psadbw)|x?orp[sd]|p(?:a(?:bs[bwd]|ck(?:ss(?:dw|wb)|uswb|usdw)|dd(?:[bwdq]|u?s[bw])|ndn?|vg[bw]|lignr)|blend(?:vb|w)|cmp(?:(?:eq|gt)[bwdq]|[ei]str[im])|(?:ext|ins)r[bwdq]|h(?:(?:add|sub)(?:d|s?w)|minposuw)|m(?:(?:ax|in)(?:sw|ub)|ul(?:hu?w|lw|udq)|a(?:dd(?:ubsw|wd)|x(?:s[bd]|u[wd]))|in(?:s[bd]|u[wd])|ov[sz]x(?:b[wdq]|w[dq]|dq)|ul(?:dq|hrsw|ld))|x?or|s(?:adbw|huf(?:b|d|[hl]w)|ign[bwd]|ll(?:w|dq?|q)|r(?:a[wd]|l(?:w|dq?|q))|ub(?:u?s[bw]|[bwdq]))|test|unpck[hl](?:bw|dq|wd|qdq))|r(?:(?:cp|sqrt)[sp]s|ound[sp][sd])|s(?:hufp[sd]|qrt[sp][sd]|tmxcsr|ub[sp][sd])|unpck[hl]p[sd])[bwlq]?|(?:m(?:askmovdqu|ov(?:hl|lh)ps)|pmovmskb))\b/i], + // [ABM, BMI1, BMI2, ADX, TSX, CLMUL, & Miscellaneous] + [PR['PR_ATTRIB_NAME'], /^\s(?:a(?:d[co]x|ndn)|b(?:extr|ls(?:i|r|msk)|zhi)|mulx|p(?:dep|ext)|r(?:orx|d(?:ran|see)d)|s(?:ar|h[rl])x|x(?:a(?:bort|cquire)|begin|end|test|release)|[lt]zcnt|v?pclmul(?:[lh]q[lh])?qdq)[bwlq]?\b/i], + // [FMA] + [PR['PR_ATTRIB_NAME'], /^\svf(?:(?:m(?:addsub|subadd)[123]{3}p)|(?:n?m(?:add|sub)[123]{3}[ps]))[sd][bwlq]?\b/i], + + // Registers will be like the corresponding "values" for attributes. + [PR['PR_ATTRIB_VALUE'], /^%?\b(?:(?:[ds]i|bp)l|(?:[re]?(?:[ac]x|b[xp]|d[xi]|s[ip]|ip))|(?:(?:a|b|c|d|[bs]p)[lh]+)|(?:[cdefgs]+s)|(?:r(?:[8-9]|1[0-5])[blwd]?)|mm[0-7]|[xy]mm(?:1[0-5]|[0-9])|zmm(?:[1-2][0-9]|3[0-1]|[0-9])|cr[0234]|dr[012367])\b/i], + // The x87 FPU registers are matched using a separate expression because of the optional parentheses. + // For some reason, "/^%?\b(?:st\(?[0-7]?\)?)/i" doesn't highlight the trailing parenthesis. + [PR['PR_ATTRIB_VALUE'], /^%?\b(?:st\(?[0-7]?)\W/i], + + // Keywords/directives relating to types are highlighted as types. + [PR['PR_TYPE'], /^(?:(?:\bshort)|(?:\b(?:(?:d|sd?|q|f|[xy]?mm)?word|[st]?byte)(?: ptr)?)|(?:\breal(?:4|8|10)\b)|(?:\bd[bwdqft]\b)|\s\.(?:byte|h?word|int|long|quad|octa|[su]leb128|float|double|s(?:hort|ingle|tring(?:8|16)?))|asci[iz])\b/i], + + // All other keywords/directives/pseudo-ops are highlighted as "keywords". + // First, match GAS-style's initial '.', and then match MASM's unadorned syntax. + [PR['PR_KEYWORD'], /^\.(?:align|balign[wl]|cfi_(?:window_save|val_encoded_addr|undefined|startproc|signal_frame|sections|same_value|re(?:turn_column|store|member_state|l_offset|gister)|personality|offset|lsda|e(?:scape|ndproc)|adjust_cfa_offset|def_cfa(?:_(?:register|offset))?)|d(?:ata|e(?:f|sc)|im)|e(?:nd(?:m|func|ef)?|q(?:u|uiv)|xitm|xtern)|f(?:il[le]|unc)|g(?:loba?l|nu_attribute)|i(?:dent|n(?:t(?:ernal|el_syntax)|clude))|l(?:li(?:st|ne)|n|oc(?:al|_mark_labels))|(?:(?:no)?alt)?macro|model|org|re(?:loc|pt)|s(?:ection|ize|kip|pace|truct|ubsection)|t(?:ag|ext|itle|ype))\s/i], + [PR['PR_KEYWORD'], /^(?:a(?:ddr|li(?:as|gnb?)|ssumes?)|bits|c(?:pu|o(?:m(?:da|pac)|ns)t)|d(?:osseg|up)|e(?:nd(?:m|p|s(?:truc)?)?|qu?|ven|x(?:itm|port|t(?:ern(?:def)?|rn)))|f(?:ar|lat)|g(?:lobal|roup)|huge|%?i(?:mport|n(?:clude(?:lib)?|voke)|struc)|l(?:arge|ength)|m(?:acro|edium)|n(?:ear|pad)|o(?:ffset|ption|rg)|p(?:ro(?:c|to)|data)|rep(?:(?:ea)?t)?|s(?:e(?:ction|g(?:ment)?)|ize(?:of)?|mall|t(?:ruct|dcall))|ti(?:ny|mes)|xdata)|(?:[\._]+(?:text|data|code|bss))\s/i], + + // Any remaining text that is followed by a colon is considered to be a label. + // This is matching is a little bit over-eager, since labels can only be a single token + // (no spaces), but that's actually OK because it will match GAS-style leading function + // signatures in compiler-generated output. Note that we must explicitly ignore comments + // on a line following a label, especially those with embedded colons, to prevent them from + // being treated as part of the label. Colons inside of string and character literals are + // also ignored. The beginning of line anchor ('^') does not seem to do what it is + // expected to do, so '\b' is used as a workaround, but this means we need to explicitly + // include any symbols that might be found preceding a label, like '.' and '$'. + [PR['PR_DECLARATION'], /^[$._]*\b[^'":;#\r\n]*:/], + + // Decimal and hexadecimal integer literals. + // (Rarely-used octal literals not yet supported.) + [PR['PR_LITERAL'], /^(?=\$?)0x[\da-f]+/i], // "0x" prefix + [PR['PR_LITERAL'], /^\d[\da-f]*h?/i], // MASM-style "h" suffix (must start with a decimal digit) + // In Intel and certain places in AT&T syntax, decimal literals occur with no identifying + // prefix or suffix (although MASM allows an optional 'd' suffix). These are tricky because + // they must be matched in just about any context, except when they are embedded within + // another identifier (like those commonly generated by compilers). This is handled by + // explicitly detecting such identifers and marking them as "plain text" to exclude them + // from future matches, and then detecting and highlighting the remaining integer literals. + [PR['PR_PLAIN'], /^(?:[a-z_\.]+\d+)|(?:\d+[a-z_\.]+)/i], + // Also, though we normally don't want to highlight any preceding symbols (like arithmetic + // operators) as being part of numeric literals, we *do* need to highlight the leading + // negative sign for negative integer literals. + // BUG: This matches the negative sign in expressions like "[eax-4]", where the operator + // actually denotes subtraction. A simple workaround is to add a space: "[eax - 4]". + [PR['PR_LITERAL'], /^(?=\$?)\-?\d+(?=d?)(?![^\s\](),\+\-*])/], + + // Finally, highlight significant punctuation: grouping, comma, and arithmetic operators. + [PR['PR_PUNCTUATION'], /^[\[\]\(\),+\-*?]/], + ]), + ['x86']); diff --git a/tests/prettify_test_2.html b/tests/prettify_test_2.html index 3ad9d72f..59bf2528 100644 --- a/tests/prettify_test_2.html +++ b/tests/prettify_test_2.html @@ -35,6 +35,7 @@ 'lang-r.js', 'lang-tcl.js', 'lang-tex.js', + 'lang-x86.js', 'lang-xq.js' ]; var styles = [ @@ -1140,5 +1141,147 @@

Elixir

end +

x86 Assembly

+

Nonsense assembly code, as might be generated by compilers asked to produce listing files, +with varying formatting to test the robustness of the syntax highlighting.

+

Intel/MASM syntax, targeting x86-32 & x87 FPU, as might be generated by MSVC

+
+include listing.inc
+.model	flat
+
+INCLUDELIB LIBCMT
+INCLUDELIB OLDNAMES
+
+; These should not be parsed as labels:
+EXTRN	__ftol2_sse:PROC
+EXTRN	_printf:PROC
+
+CONST	SEGMENT
+real1        DD 04f800000h         ; 4.29497e+009
+       real2 DQ 00000000000000000  ; 0.0
+FormatString DB '%s: %s', 00H      ; `string'
+strOutput    DB "Output is", 0     ; `string'
+CONST	ENDS
+
+_TEXT	SEGMENT
+tempValue = 8              ; size = 4
+?DemoFxn@@YGHI@Z PROC      ; DemoFxn, COMDAT
+	push     esi
+	fldz
+	mov      esi, DWORD PTR [esp + size]
+	mov      eax, esi
+	fldpi
+	mov      DWORD PTR tempValue[esp], eax
+	fild     dword ptr tempValue[esp]
+	test     eax, eax
+	jns      SHORT $LN12@DemoFxn
+	fadd     DWORD PTR realValue2
+$LN12@DemoFxn:
+	fldlg2
+	fxch     ST(1)
+	fyl2x
+	fadd     DWORD PTR [real1]
+	call     __ftol2_sse
+	mov      ecx, eax
+	cmp      esi, 100000000
+	jb       SHORT $LN4@DemoFxn
+	mov      eax, 55e63b89H
+	mul      esi
+	add      ecx, -8
+	shr      edx, 25
+	mov      esi, edx
+$LN4@DemoFxn:
+	lea      eax, DWORD PTR [edi + 16]
+	lea      edx, DWORD PTR [ecx*4]
+	cmp      esi, 00CC2710h
+	jb short $LN3@DemoFxn
+	mov      eax, -776530087
+$LN3@DemoFxn:
+cmp      esi, 100
+jb       SHORT $LN2@DemoFxn
+mov      eax, 1374389535
+mul      edi
+fld      ST(1)
+fxch     st(1)
+fsubrp   ST(2), ST(0)
+fld qword ptr [eax - 40]
+fsubrp   ST(3), ST(0)
+fld      ST
+$LN2@DemoFxn:
+	cmp      esi, 10
+	pop      ebx
+	fstp     st
+	dec      eax
+	lea      eax, DWORD PTR [ecx + 1]
+	push     OFFSET strOutput
+	push     offset FormatString
+	call     _printf
+	add      esp, 12
+	jae      SHORT $LN1@DemoFxn
+	mov      eax, ecx
+$LN1@DemoFxn:    ret 4
+?DemoFxn@@YGHI@Z ENDP; DemoFxn
+_TEXT	ENDS
+
+END
+
+

AT&T/GAS syntax, targeting x86-64 with AVX2, as might be generated by ICC

+
+.L_2il0floatpacket.0:
+        .long   0x3f800000
+
+DemoFxn(unsigned int, char const*):    # @DemoFxn(unsigned int, char const*)
+        pushq   %r14
+        movl    %edi, %ebx
+        movl    %ebx, %r14d
+        vxorpd  %xmm0, %xmm0, %xmm0
+        testq   %rsi, %rsi
+        je      ..B1.7
+        vcvtsi2ssq      %r14, %xmm0, %xmm0
+        callq   std::log10(float)
+        vaddss  .L_2il0floatpacket.0(%rip), %xmm0, %xmm0
+        vcvttss2si      %xmm0, %ecx
+        cmpl    $100000000, %ebx
+        jb      ..B1.3
+        addl    $8, %ecx
+        imulq   $1441151881, %r14, %rbx # imm = 0x55E63B89
+        shrq    $57, %rbx
+        jmp     ..B1.7
+..B1.3:
+        cmpl    $10000, %ebx            # imm = 0x2710
+        jb      ..B1.5
+        addl    $4, %ecx
+        movl    $3518437209, %ebx       # imm = 0xD1B71759
+        imulq   %r14, %rbx
+        shrq    $45, %rbx
+..B1.5:
+vaddpd  (%rdi,%rdx,8), %ymm0, %ymm0
+vaddpd  32(%rdi,%rdx,8), %ymm1, %ymm1
+vaddpd  64(%rdi,%rdx,8), %ymm2, %ymm2
+addq    $32, %rdx
+movl    %ebx, %eax
+imulq   $0x51EB851F, %rax, %rbx
+testq   %r8, %r8
+jp      ..B1.7
+shrq    $37, %rbx
+..B1.7:
+        xorl    %eax, %eax
+        cmpl    $9, %ebx
+        seta    %al
+        vextractf128    $1, %ymm0, %xmm1
+        vaddpd  %ymm1, %ymm0, %ymm0
+        vhaddpd %ymm0, %ymm0, %ymm0
+        addl    %ecx, %eax
+        addq    $8, %rsp
+        popq    %r15
+        vzeroupper
+        retq
+
+# Unused data:
+FormatString:
+.asciz  "%s: %s"
+strOutput: .asciz  "Output is"
+
+ diff --git a/tests/prettify_test_2.js b/tests/prettify_test_2.js index 239ca887..20677836 100644 --- a/tests/prettify_test_2.js +++ b/tests/prettify_test_2.js @@ -1008,5 +1008,139 @@ var goldens = { ' `END`ATV~C<hello>`END`PLN\n' + ' `END`KWDend`END`PLN\n' + '\n' + -'`END`KWDend`END') +'`END`KWDend`END'), + x86_masm: ( +'`KWDinclude`END`PLN listing.inc\n' + +'`END`KWD.model flat`END`PLN\n' + +'\n' + +'`END`KWDINCLUDELIB`END`PLN LIBCMT\n' + +'`END`KWDINCLUDELIB`END`PLN OLDNAMES\n' + +'\n' + +'`END`COM; These should not be parsed as labels:`END`PLN\n' + +'`END`KWDEXTRN`END`PLN __ftol2_sse:`END`KWDPROC`END`PLN\n' + +'`END`KWDEXTRN`END`PLN _printf:`END`KWDPROC`END`PLN\n' + +'\n' + +'`END`KWDCONST`END`PLN `END`KWDSEGMENT`END`PLN\n' + +'real1 `END`TYPDD`END`PLN `END`LIT04f800000h`END`PLN `END`COM; 4.29497e+009`END`PLN\n' + +' real2 `END`TYPDQ`END`PLN `END`LIT00000000000000000`END`PLN `END`COM; 0.0`END`PLN\n' + +'FormatString `END`TYPDB`END`PLN `END`STR\'%s: %s\'`END`PUN,`END`PLN `END`LIT00H`END`PLN `END`COM; `string\'`END`PLN\n' + +'strOutput `END`TYPDB`END`PLN `END`STR"Output is"`END`PUN,`END`PLN `END`LIT0`END`PLN `END`COM; `string\'`END`PLN\n' + +'`END`KWDCONST`END`PLN `END`KWDENDS`END`PLN\n' + +'\n' + +'`END`KWD_TEXT SEGMENT`END`PLN\n' + +'tempValue = `END`LIT8`END`PLN `END`COM; size = 4`END`PLN\n' + +'`END`PUN?`END`PLNDemoFxn@@YGHI@Z `END`KWDPROC`END`PLN `END`COM; DemoFxn, COMDAT`END`PLN\n' + +'`END`ATN push`END`PLN `END`ATVesi`END`PLN\n' + +'`END`ATN fldz`END`PLN\n' + +'`END`ATN mov`END`PLN `END`ATVesi`END`PUN,`END`PLN `END`TYPDWORD PTR`END`PLN `END`PUN[`END`ATVesp`END`PLN `END`PUN+`END`PLN `END`KWDsize`END`PUN]`END`PLN\n' + +'`END`ATN mov`END`PLN `END`ATVeax`END`PUN,`END`PLN `END`ATVesi`END`PLN\n' + +'`END`ATN fldpi`END`PLN\n' + +'`END`ATN mov`END`PLN `END`TYPDWORD PTR`END`PLN tempValue`END`PUN[`END`ATVesp`END`PUN],`END`PLN `END`ATVeax`END`PLN\n' + +'`END`ATN fild`END`PLN `END`TYPdword ptr`END`PLN tempValue`END`PUN[`END`ATVesp`END`PUN]`END`PLN\n' + +'`END`ATN test`END`PLN `END`ATVeax`END`PUN,`END`PLN `END`ATVeax`END`PLN\n' + +'`END`ATN jns`END`PLN `END`TYPSHORT`END`PLN $LN12@DemoFxn\n' + +'`END`ATN fadd`END`PLN `END`TYPDWORD PTR`END`PLN realValue2\n' + +'`END`DEC$LN12@DemoFxn:`END`PLN\n' + +'`END`ATN fldlg2`END`PLN\n' + +'`END`ATN fxch`END`PLN `END`ATVST(1)`END`PLN\n' + +'`END`ATN fyl2x`END`PLN\n' + +'`END`ATN fadd`END`PLN `END`TYPDWORD PTR`END`PLN `END`PUN[`END`PLNreal1`END`PUN]`END`PLN\n' + +'`END`ATN call`END`PLN __ftol2_sse\n' + +'`END`ATN mov`END`PLN `END`ATVecx`END`PUN,`END`PLN `END`ATVeax`END`PLN\n' + +'`END`ATN cmp`END`PLN `END`ATVesi`END`PUN,`END`PLN `END`LIT100000000`END`PLN\n' + +'`END`ATN jb`END`PLN `END`TYPSHORT`END`PLN $LN4@DemoFxn\n' + +'`END`ATN mov`END`PLN `END`ATVeax`END`PUN,`END`PLN `END`LIT55e63b89H`END`PLN\n' + +'`END`ATN mul`END`PLN `END`ATVesi`END`PLN\n' + +'`END`ATN add`END`PLN `END`ATVecx`END`PUN,`END`PLN `END`LIT-8`END`PLN\n' + +'`END`ATN shr`END`PLN `END`ATVedx`END`PUN,`END`PLN `END`LIT25`END`PLN\n' + +'`END`ATN mov`END`PLN `END`ATVesi`END`PUN,`END`PLN `END`ATVedx`END`PLN\n' + +'`END`DEC$LN4@DemoFxn:`END`PLN\n' + +'`END`ATN lea`END`PLN `END`ATVeax`END`PUN,`END`PLN `END`TYPDWORD PTR`END`PLN `END`PUN[`END`ATVedi`END`PLN `END`PUN+`END`PLN `END`LIT16`END`PUN]`END`PLN\n' + +'`END`ATN lea`END`PLN `END`ATVedx`END`PUN,`END`PLN `END`TYPDWORD PTR`END`PLN `END`PUN[`END`ATVecx`END`PUN*`END`LIT4`END`PUN]`END`PLN\n' + +'`END`ATN cmp`END`PLN `END`ATVesi`END`PUN,`END`PLN `END`LIT00CC2710h`END`PLN\n' + +'`END`ATN jb`END`PLN `END`TYPshort`END`PLN $LN3@DemoFxn\n' + +'`END`ATN mov`END`PLN `END`ATVeax`END`PUN,`END`PLN `END`LIT-776530087`END`PLN\n' + +'`END`DEC$LN3@DemoFxn:`END`ATN\n' + +'cmp`END`PLN `END`ATVesi`END`PUN,`END`PLN `END`LIT100`END`ATN\n' + +'jb`END`PLN `END`TYPSHORT`END`PLN $LN2@DemoFxn`END`ATN\n' + +'mov`END`PLN `END`ATVeax`END`PUN,`END`PLN `END`LIT1374389535`END`ATN\n' + +'mul`END`PLN `END`ATVedi`END`ATN\n' + +'fld`END`PLN `END`ATVST(1)`END`ATN\n' + +'fxch`END`PLN `END`ATVst(1)`END`ATN\n' + +'fsubrp`END`PLN `END`ATVST(2)`END`PUN,`END`PLN `END`ATVST(0)`END`ATN\n' + +'fld`END`PLN `END`TYPqword ptr`END`PLN `END`PUN[`END`ATVeax`END`PLN `END`PUN-`END`PLN `END`LIT40`END`PUN]`END`ATN\n' + +'fsubrp`END`PLN `END`ATVST(3)`END`PUN,`END`PLN `END`ATVST(0)`END`ATN\n' + +'fld`END`PLN `END`ATVST\n' + +'`END`DEC$LN2@DemoFxn:`END`PLN\n' + +'`END`ATN cmp`END`PLN `END`ATVesi`END`PUN,`END`PLN `END`LIT10`END`PLN\n' + +'`END`ATN pop`END`PLN `END`ATVebx`END`PLN\n' + +'`END`ATN fstp`END`PLN `END`ATVst\n' + +'`END`ATN dec`END`PLN `END`ATVeax`END`PLN\n' + +'`END`ATN lea`END`PLN `END`ATVeax`END`PUN,`END`PLN `END`TYPDWORD PTR`END`PLN `END`PUN[`END`ATVecx`END`PLN `END`PUN+`END`PLN `END`LIT1`END`PUN]`END`PLN\n' + +'`END`ATN push`END`PLN `END`KWDOFFSET`END`PLN strOutput\n' + +'`END`ATN push`END`PLN `END`KWDoffset`END`PLN FormatString\n' + +'`END`ATN call`END`PLN _printf\n' + +'`END`ATN add`END`PLN `END`ATVesp`END`PUN,`END`PLN `END`LIT12`END`PLN\n' + +'`END`ATN jae`END`PLN `END`TYPSHORT`END`PLN $LN1@DemoFxn\n' + +'`END`ATN mov`END`PLN `END`ATVeax`END`PUN,`END`PLN `END`ATVecx`END`PLN\n' + +'`END`DEC$LN1@DemoFxn:`END`PLN `END`ATN ret`END`PLN `END`LIT4`END`PLN\n' + +'`END`PUN?`END`PLNDemoFxn@@YGHI@Z `END`KWDENDP`END`COM; DemoFxn`END`PLN\n' + +'`END`KWD_TEXT ENDS`END`PLN\n' + +'\n' + +'`END`KWDEND`END'), + x86_gas: ( +'`DEC.L_2il0floatpacket.0:`END`PLN\n' + +' `END`TYP .long`END`PLN `END`LIT0x3f800000`END`PLN\n' + +'\n' + +'`END`DECDemoFxn(unsigned int, char const*):`END`PLN `END`COM# @DemoFxn(unsigned int, char const*)`END`PLN\n' + +' `END`ATN pushq`END`PLN `END`ATV%r14`END`PLN\n' + +' `END`ATN movl`END`PLN `END`ATV%edi`END`PUN,`END`PLN `END`ATV%ebx`END`PLN\n' + +' `END`ATN movl`END`PLN `END`ATV%ebx`END`PUN,`END`PLN `END`ATV%r14d`END`PLN\n' + +' `END`ATN vxorpd`END`PLN `END`ATV%xmm0`END`PUN,`END`PLN `END`ATV%xmm0`END`PUN,`END`PLN `END`ATV%xmm0`END`PLN\n' + +' `END`ATN testq`END`PLN `END`ATV%rsi`END`PUN,`END`PLN `END`ATV%rsi`END`PLN\n' + +' `END`ATN je`END`PLN ..B1.7\n' + +' `END`ATN vcvtsi2ssq`END`PLN `END`ATV%r14`END`PUN,`END`PLN `END`ATV%xmm0`END`PUN,`END`PLN `END`ATV%xmm0`END`PLN\n' + +' `END`ATN callq`END`PLN std::log10`END`PUN(`END`PLNfloat`END`PUN)`END`PLN\n' + +' `END`ATN vaddss`END`PLN .L_2il0floatpacket.0`END`PUN(`END`ATV%rip`END`PUN),`END`PLN `END`ATV%xmm0`END`PUN,`END`PLN `END`ATV%xmm0`END`PLN\n' + +' `END`ATN vcvttss2si`END`PLN `END`ATV%xmm0`END`PUN,`END`PLN `END`ATV%ecx`END`PLN\n' + +' `END`ATN cmpl`END`PLN $`END`LIT100000000`END`PUN,`END`PLN `END`ATV%ebx`END`PLN\n' + +' `END`ATN jb`END`PLN ..B1.3\n' + +' `END`ATN addl`END`PLN $`END`LIT8`END`PUN,`END`PLN `END`ATV%ecx`END`PLN\n' + +' `END`ATN imulq`END`PLN $`END`LIT1441151881`END`PUN,`END`PLN `END`ATV%r14`END`PUN,`END`PLN `END`ATV%rbx`END`PLN `END`COM# imm = 0x55E63B89`END`PLN\n' + +' `END`ATN shrq`END`PLN $`END`LIT57`END`PUN,`END`PLN `END`ATV%rbx`END`PLN\n' + +' `END`ATN jmp`END`PLN ..B1.7\n' + +'`END`DEC..B1.3:`END`PLN\n' + +' `END`ATN cmpl`END`PLN $`END`LIT10000`END`PUN,`END`PLN `END`ATV%ebx`END`PLN `END`COM# imm = 0x2710`END`PLN\n' + +' `END`ATN jb`END`PLN ..B1.5\n' + +' `END`ATN addl`END`PLN $`END`LIT4`END`PUN,`END`PLN `END`ATV%ecx`END`PLN\n' + +' `END`ATN movl`END`PLN $`END`LIT3518437209`END`PUN,`END`PLN `END`ATV%ebx`END`PLN `END`COM# imm = 0xD1B71759`END`PLN\n' + +' `END`ATN imulq`END`PLN `END`ATV%r14`END`PUN,`END`PLN `END`ATV%rbx`END`PLN\n' + +' `END`ATN shrq`END`PLN $`END`LIT45`END`PUN,`END`PLN `END`ATV%rbx`END`PLN\n' + +'`END`DEC..B1.5:`END`ATN\n' + +'vaddpd`END`PLN `END`PUN(`END`ATV%rdi`END`PUN,`END`ATV%rdx`END`PUN,`END`LIT8`END`PUN),`END`PLN `END`ATV%ymm0`END`PUN,`END`PLN `END`ATV%ymm0`END`ATN\n' + +'vaddpd`END`PLN `END`LIT32`END`PUN(`END`ATV%rdi`END`PUN,`END`ATV%rdx`END`PUN,`END`LIT8`END`PUN),`END`PLN `END`ATV%ymm1`END`PUN,`END`PLN `END`ATV%ymm1`END`ATN\n' + +'vaddpd`END`PLN `END`LIT64`END`PUN(`END`ATV%rdi`END`PUN,`END`ATV%rdx`END`PUN,`END`LIT8`END`PUN),`END`PLN `END`ATV%ymm2`END`PUN,`END`PLN `END`ATV%ymm2`END`ATN\n' + +'addq`END`PLN $`END`LIT32`END`PUN,`END`PLN `END`ATV%rdx`END`ATN\n' + +'movl`END`PLN `END`ATV%ebx`END`PUN,`END`PLN `END`ATV%eax`END`ATN\n' + +'imulq`END`PLN $`END`LIT0x51EB851F`END`PUN,`END`PLN `END`ATV%rax`END`PUN,`END`PLN `END`ATV%rbx`END`ATN\n' + +'testq`END`PLN `END`ATV%r8`END`PUN,`END`PLN `END`ATV%r8`END`ATN\n' + +'jp`END`PLN ..B1.7`END`ATN\n' + +'shrq`END`PLN $`END`LIT37`END`PUN,`END`PLN `END`ATV%rbx`END`PLN\n' + +'`END`DEC..B1.7:`END`PLN\n' + +' `END`ATN xorl`END`PLN `END`ATV%eax`END`PUN,`END`PLN `END`ATV%eax`END`PLN\n' + +' `END`ATN cmpl`END`PLN $`END`LIT9`END`PUN,`END`PLN `END`ATV%ebx`END`PLN\n' + +' `END`ATN seta`END`PLN `END`ATV%al`END`PLN\n' + +' `END`ATN vextractf128`END`PLN $`END`LIT1`END`PUN,`END`PLN `END`ATV%ymm0`END`PUN,`END`PLN `END`ATV%xmm1`END`PLN\n' + +' `END`ATN vaddpd`END`PLN `END`ATV%ymm1`END`PUN,`END`PLN `END`ATV%ymm0`END`PUN,`END`PLN `END`ATV%ymm0`END`PLN\n' + +' `END`ATN vhaddpd`END`PLN `END`ATV%ymm0`END`PUN,`END`PLN `END`ATV%ymm0`END`PUN,`END`PLN `END`ATV%ymm0`END`PLN\n' + +' `END`ATN addl`END`PLN `END`ATV%ecx`END`PUN,`END`PLN `END`ATV%eax`END`PLN\n' + +' `END`ATN addq`END`PLN $`END`LIT8`END`PUN,`END`PLN `END`ATV%rsp`END`PLN\n' + +' `END`ATN popq`END`PLN `END`ATV%r15`END`PLN\n' + +' `END`ATN vzeroupper`END`PLN\n' + +' `END`ATN retq`END`PLN\n' + +'\n' + +'`END`COM# Unused data:`END`PLN\n' + +'`END`DECFormatString:`END`PLN\n' + +'.`END`TYPasciz`END`PLN `END`STR"%s: %s"`END`PLN\n' + +'`END`DECstrOutput:`END`PLN .`END`TYPasciz`END`PLN `END`STR"Output is"`END') };