mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-01-30 16:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support __utf16__ and __utf32__ in an expression context

Browse Source 
Support __utf16__ and __utf32__ in expression contexts.
This commit is contained in:
H. Peter Anvin 2008-06-14 21:08:38 -07:00
parent 503e71d3ee
commit 9c749101ef
2 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
eval.c
View File

@ -662,6 +662,48 @@ static expr *eval_floatize(enum floatize type)
return finishtemp();
}
static expr *eval_strfunc(enum strfunc type)
{
char *string;
size_t string_len;
int64_t val;
bool parens, rn_warn;
i = scan(scpriv, tokval);
if (i == '(') {
parens = true;
i = scan(scpriv, tokval);
}
if (i != TOKEN_STR) {
error(ERR_NONFATAL, "expecting string");
return NULL;
}
string_len = string_transform(tokval->t_charptr, tokval->t_inttwo,
&string, type);
if (string_len == (size_t)-1) {
error(ERR_NONFATAL, "invalid string for transform");
return NULL;
}
val = readstrnum(string, string_len, &rn_warn);
if (parens) {
i = scan(scpriv, tokval);
if (i != ')') {
error(ERR_NONFATAL, "expecting `)'");
return NULL;
}
}
if (rn_warn)
error(ERR_WARNING|ERR_PASS1, "character constant too long");
begintemp();
addtotemp(EXPR_SIMPLE, val);
i = scan(scpriv, tokval);
return finishtemp();
}
static expr *expr6(int critical)
{
int32_t type;
@ -730,6 +772,9 @@ static expr *expr6(int critical)
case TOKEN_FLOATIZE:
return eval_floatize(tokval->t_integer);
case TOKEN_STRFUNC:
return eval_strfunc(tokval->t_integer);
case '(':
i = scan(scpriv, tokval);
e = bexpr(critical);

18
test/utf.asm Normal file
View File

@ -0,0 +1,18 @@
%define u(x) __utf16__(x)
%define w(x) __utf32__(x)
db `Test \u306a\U0001abcd\n`
dw u(`Test \u306a\U0001abcd\n`)
dd w(`Test \u306a\U0001abcd\n`)
db `\u306a`
db `\xe3\x81\xaa`
nop
mov ax,u(`a`)
mov bx,u(`\u306a`)
mov cx,u(`\xe3\x81\xaa`)
mov eax,u(`ab`)
mov ebx,u(`\U0001abcd`)
mov ecx,w(`\U0001abcd`)