diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2017-06-27 11:21:12 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2017-06-27 11:21:12 -0300 |
commit | 124bfd20817d4624d2b69a4dc41182485912b821 (patch) | |
tree | 313f1bfaa63f108b900ed620fb1d4f4e83036c0f /ldump.c | |
parent | b42430fd3a6200eaaf4020be90c4d47f7e251b67 (diff) | |
download | lua-124bfd20817d4624d2b69a4dc41182485912b821.tar.gz lua-124bfd20817d4624d2b69a4dc41182485912b821.tar.bz2 lua-124bfd20817d4624d2b69a4dc41182485912b821.zip |
dumping ints and size_ts compacted
Diffstat (limited to 'ldump.c')
-rw-r--r-- | ldump.c | 32 |
1 files changed, 21 insertions, 11 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: ldump.c,v 2.37 2015/10/08 15:53:49 roberto Exp roberto $ | 2 | ** $Id: ldump.c,v 2.38 2017/06/27 11:35:31 roberto Exp roberto $ |
3 | ** save precompiled Lua chunks | 3 | ** save precompiled Lua chunks |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -55,8 +55,23 @@ static void DumpByte (int y, DumpState *D) { | |||
55 | } | 55 | } |
56 | 56 | ||
57 | 57 | ||
58 | /* DumpInt Buff Size */ | ||
59 | #define DIBS ((sizeof(size_t) * 8 / 7) + 1) | ||
60 | |||
61 | static void DumpSize (size_t x, DumpState *D) { | ||
62 | lu_byte buff[DIBS]; | ||
63 | int n = 0; | ||
64 | do { | ||
65 | buff[DIBS - (++n)] = x & 0x7f; /* fill buffer in reverse order */ | ||
66 | x >>= 7; | ||
67 | } while (x != 0); | ||
68 | buff[DIBS - 1] |= 0x80; /* mark last byte */ | ||
69 | DumpVector(buff + DIBS - n, n, D); | ||
70 | } | ||
71 | |||
72 | |||
58 | static void DumpInt (int x, DumpState *D) { | 73 | static void DumpInt (int x, DumpState *D) { |
59 | DumpVar(x, D); | 74 | DumpSize(x, D); |
60 | } | 75 | } |
61 | 76 | ||
62 | 77 | ||
@@ -72,17 +87,12 @@ static void DumpInteger (lua_Integer x, DumpState *D) { | |||
72 | 87 | ||
73 | static void DumpString (const TString *s, DumpState *D) { | 88 | static void DumpString (const TString *s, DumpState *D) { |
74 | if (s == NULL) | 89 | if (s == NULL) |
75 | DumpByte(0, D); | 90 | DumpSize(0, D); |
76 | else { | 91 | else { |
77 | size_t size = tsslen(s) + 1; /* include trailing '\0' */ | 92 | size_t size = tsslen(s); |
78 | const char *str = getstr(s); | 93 | const char *str = getstr(s); |
79 | if (size < 0xFF) | 94 | DumpSize(size + 1, D); |
80 | DumpByte(cast_int(size), D); | 95 | DumpVector(str, size, D); |
81 | else { | ||
82 | DumpByte(0xFF, D); | ||
83 | DumpVar(size, D); | ||
84 | } | ||
85 | DumpVector(str, size - 1, D); /* no need to save '\0' */ | ||
86 | } | 96 | } |
87 | } | 97 | } |
88 | 98 | ||