mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-26 21:21:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Add L postfix for hex string

Browse source
This commit is contained in:
Dennis Korpel 2024-01-31 19:48:06 +01:00
parent 068ecd5799
commit 3e9bc4ee17
8 changed files with 48 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
changelog/dmd.hexstring-cast.dd
View file

@ -11,13 +11,17 @@ immutable uint[] data = cast(immutable uint[]) x"AABBCCDD";
static assert(data[0] == 0xAABBCCDD);
---
Character postfixes can now also be used for integers of size 2 or 4:
Character postfixes can now also be used for integers of size 2 or 4, while an `L` postfix can be used for size 8:
---
immutable ushort[] f = x"80 3F"w;
static assert(f[0] == 0x803F);
immutable int[] f = x"80 35 FF FD"d;
static assert(f[0] == 0x803FFF);
immutable int[] g = x"80 35 FF FD"d;
static assert(g[0] == 0x803FFFFD);
auto h = x"0011 2233 4455 6677"L;
static assert(h[0] == 0x0011_2233_4455_6677);
static assert(is(typeof(h) == immutable ulong[]));
---
Formerly, they would pad each byte with 1 or 3 zeros, which did not serve a purpose (See [Issue 24363](https://issues.dlang.org/show_bug.cgi?id=24363)).

15
compiler/src/dmd/backend/dout.d
View file

@ -525,6 +525,9 @@ Symbol *out_string_literal(const(char)* str, uint len, uint sz)
ty = TYchar16;
else if (sz == 4)
ty = TYdchar;
else if (sz == 8)
ty = TYulong;
Symbol *s = symbol_generate(SC.static_,type_static_array(len, tstypes[ty]));
switch (config.objfmt)
{
@ -573,6 +576,18 @@ Symbol *out_string_literal(const(char)* str, uint len, uint sz)
}
break;
case 8:
foreach (i; 0.. len)
{
auto p = cast(const(ulong)*)str;
if (p[i] == 0)
{
s.Sseg = CDATA;
break;
}
}
break;
default:
assert(0);
}

6
compiler/src/dmd/backend/elfobj.d
View file

@ -607,8 +607,10 @@ int ElfObj_string_literal_segment(uint sz)
* .rodata.cstN - N fixed size readonly constants N bytes in size,
* aligned to the same size
*/
static immutable char[4][3] name = [ "1.1", "2.2", "4.4" ];
const int i = (sz == 4) ? 2 : sz - 1;
import core.bitop : bsr, bsf;
assert(sz != 0 && bsr(sz) == bsf(sz)); // sz must be power of 2
static immutable char[4][4] name = [ "1.1", "2.2", "4.4", "8.8" ];
const int i = bsr(sz);
// FIXME: can't use SHF_MERGE | SHF_STRINGS because of https://issues.dlang.org/show_bug.cgi?id=22483
const IDXSEC seg = ElfObj_getsegment(".rodata.str".ptr, name[i].ptr, SHT_PROGBITS, SHF_ALLOC, sz);
return seg;

2
compiler/src/dmd/dcast.d
View file

@ -629,7 +629,7 @@ MATCH implicitConvTo(Expression e, Type t)
TY tyn = e.type.nextOf().ty;
if (!tyn.isSomeChar)
if (!tyn.isSomeChar && !e.hexString)
return visit(e);
switch (t.ty)

4
compiler/src/dmd/expressionsem.d
View file

@ -4248,6 +4248,10 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor
const data = cast(const ubyte[]) e.peekString();
switch (e.postfix)
{
case 'L':
e.sz = 8;
e.type = Type.tuns64.immutableOf().arrayOf();
break;
case 'd':
e.sz = 4;
e.type = Type.tdstring;

7
compiler/src/dmd/lexer.d
View file

@ -1568,8 +1568,13 @@ class Lexer
stringbuffer.writeByte(v);
}
t.setString(stringbuffer);
t.postfix = 'h';
stringPostfix(t);
if (*p == 'L')
{
t.postfix = 'L';
p++;
}
return TOK.hexadecimalString;
default:
if (c >= '0' && c <= '9')

5
compiler/src/dmd/todt.d
View file

@ -427,8 +427,9 @@ void Expression_toDt(Expression e, ref DtBuilder dtb)
}
else
{
ubyte pow2 = e.sz == 4 ? 2 : 1;
dtb.abytes(0, n * e.sz, p, cast(uint)e.sz, pow2);
import core.bitop : bsr;
const pow2 = cast(ubyte) bsr(e.sz);
dtb.abytes(0, n * e.sz, p, cast(uint) e.sz, pow2);
}
break;

11
compiler/test/runnable/literal.d
View file

@ -243,23 +243,28 @@ void test12950()
void testHexstring()
{
static immutable uint[] x = cast(immutable uint[]) x"FFAADDEE";
static immutable uint[] x = cast(immutable uint[]) x"FFAADDEE"d;
static assert(x[0] == 0xFFAADDEE);
assert(x[0] == 0xFFAADDEE);
static immutable ulong[] y = cast(immutable ulong[]) x"1122334455667788AABBCCDDEEFF0099";
static assert(is(typeof(x""L) == immutable(ulong)[]));
static immutable ulong[] y = x"1122334455667788AABBCCDDEEFF0099"L;
static assert(y[0] == 0x1122334455667788);
static assert(y[1] == 0xAABBCCDDEEFF0099);
assert(y[0] == 0x1122334455667788);
assert(y[1] == 0xAABBCCDDEEFF0099);
immutable long[] c = x"1122334455667788AABBCCDDEEFF0099"L;
assert(c[0] == 0x1122334455667788);
assert(c[1] == 0xAABBCCDDEEFF0099);
// Test that mangling of StringExp with size 8 is the same as array literal mangling:
void f(immutable ulong[] a)() {}
static assert(f!y.mangleof == f!([0x1122334455667788, 0xAABBCCDDEEFF0099]).mangleof);
// Test printing StringExp with size 8
enum toStr(immutable ulong[] v) = v.stringof;
static assert(toStr!y == `x"88776655443322119900FFEEDDCCBBAA"`);
static assert(toStr!y == `x"88776655443322119900FFEEDDCCBBAA"L`);
// Hex string postfixes
// https://issues.dlang.org/show_bug.cgi?id=24363