Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: third_party/yasm/patched-yasm/modules/parsers/nasm/nasm-token.re

Issue 6170009: Update our yasm copy to yasm 1.1.0 (Part 1: yasm side)... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/yasm/patched-yasm/modules/parsers/nasm/nasm-token.re
===================================================================
--- third_party/yasm/patched-yasm/modules/parsers/nasm/nasm-token.re (revision 71129)
+++ third_party/yasm/patched-yasm/modules/parsers/nasm/nasm-token.re (working copy)
@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <util.h>
-RCSID("$Id: nasm-token.re 2139 2008-10-08 05:19:47Z peter $");
+RCSID("$Id: nasm-token.re 2277 2010-01-19 07:03:15Z peter $");
#include <libyasm.h>
@@ -84,6 +84,10 @@
return NONLOCAL_ID;
return SPECIAL_ID;
}
+ if (parser_nasm->masm && tok[zeropos] == '.') {
+ lvalp->str_val = yasm__xstrndup(tok + zeropos, toklen - zeropos);
+ return SPECIAL_ID;
+ }
if (parser_nasm->tasm && (!tasm_locals ||
(tok[zeropos] == '.' &&
tok[zeropos+1] != '@' && tok[zeropos+2] != '@'))) {
@@ -416,10 +420,20 @@
case YASM_ARCH_TARGETMOD:
s->tok[TOKLEN] = savech;
RETURN(TARGETMOD);
+ case YASM_ARCH_REGGROUP:
+ if (parser_nasm->masm) {
+ s->tok[TOKLEN] = savech;
+ RETURN(REGGROUP);
+ }
default:
break;
}
- if (parser_nasm->tasm) {
+ if (parser_nasm->masm) {
+ if (!yasm__strcasecmp(TOK, "offset")) {
+ s->tok[TOKLEN] = savech;
+ RETURN(OFFSET);
+ }
+ } else if (parser_nasm->tasm) {
if (!yasm__strcasecmp(TOK, "shl")) {
s->tok[TOKLEN] = savech;
RETURN(LEFT_OP);
@@ -436,6 +450,10 @@
s->tok[TOKLEN] = savech;
RETURN('|');
}
+ if (!yasm__strcasecmp(TOK, "not")) {
+ s->tok[TOKLEN] = savech;
+ RETURN('~');
+ }
if (!yasm__strcasecmp(TOK, "low")) {
s->tok[TOKLEN] = savech;
RETURN(LOW);

Powered by Google App Engine
This is Rietveld 408576698