Index: src/trusted/validator_ragel/gen/decoder_x86_64.c |
=================================================================== |
--- src/trusted/validator_ragel/gen/decoder_x86_64.c (revision 10976) |
+++ src/trusted/validator_ragel/gen/decoder_x86_64.c (working copy) |
@@ -20,7 +20,7 @@ |
#include "native_client/src/include/elf32.h" |
#include "native_client/src/shared/utils/types.h" |
-#include "native_client/src/trusted/validator_ragel/unreviewed/decoder_internal.h" |
+#include "native_client/src/trusted/validator_ragel/decoder_internal.h" |
/* |
* These prefixes are only useful in AMD64 mode, but they will "cleaned up" by |
@@ -49,6 +49,10 @@ |
+/* |
+ * The "write data" statement causes Ragel to emit the constant static data |
+ * needed by the ragel machine. |
+ */ |
static const short _x86_64_decoder_actions[] = { |
0, 1, 0, 1, 1, 1, 2, 1, |
@@ -12620,7 +12624,7 @@ |
128u, 135u, 136u, 143u, 144u, 151u, 152u, 159u, |
160u, 167u, 168u, 175u, 176u, 183u, 184u, 191u, |
192u, 199u, 200u, 207u, 208u, 215u, 216u, 223u, |
- 224u, 231u, 232u, 239u, 240u, 247u, 5u, 13u, |
+ 224u, 231u, 240u, 247u, 248u, 255u, 5u, 13u, |
21u, 29u, 37u, 45u, 53u, 61u, 69u, 77u, |
85u, 93u, 101u, 109u, 117u, 125u, 133u, 141u, |
149u, 157u, 165u, 173u, 181u, 189u, 197u, 205u, |
@@ -12635,8 +12639,8 @@ |
104u, 111u, 112u, 119u, 120u, 127u, 128u, 135u, |
136u, 143u, 144u, 151u, 152u, 159u, 160u, 167u, |
168u, 175u, 176u, 183u, 184u, 191u, 192u, 199u, |
- 200u, 207u, 208u, 215u, 216u, 223u, 232u, 239u, |
- 240u, 247u, 248u, 255u, 5u, 13u, 21u, 29u, |
+ 200u, 207u, 208u, 215u, 216u, 223u, 224u, 231u, |
+ 232u, 239u, 240u, 247u, 5u, 13u, 21u, 29u, |
37u, 45u, 53u, 61u, 69u, 77u, 85u, 93u, |
101u, 109u, 117u, 125u, 133u, 141u, 149u, 157u, |
165u, 173u, 181u, 189u, 197u, 205u, 213u, 221u, |
@@ -12650,8 +12654,8 @@ |
80u, 87u, 88u, 95u, 96u, 103u, 104u, 111u, |
112u, 119u, 120u, 127u, 128u, 135u, 136u, 143u, |
144u, 151u, 152u, 159u, 160u, 167u, 168u, 175u, |
- 176u, 183u, 184u, 191u, 192u, 199u, 200u, 207u, |
- 208u, 215u, 216u, 223u, 224u, 231u, 240u, 247u, |
+ 176u, 183u, 184u, 191u, 192u, 199u, 208u, 215u, |
+ 216u, 223u, 224u, 231u, 232u, 239u, 240u, 247u, |
248u, 255u, 4u, 5u, 12u, 13u, 20u, 21u, |
28u, 29u, 36u, 37u, 44u, 45u, 52u, 53u, |
60u, 61u, 68u, 76u, 84u, 92u, 100u, 108u, |
@@ -13314,8 +13318,8 @@ |
103u, 104u, 111u, 112u, 119u, 120u, 127u, 128u, |
135u, 136u, 143u, 144u, 151u, 152u, 159u, 160u, |
167u, 168u, 175u, 176u, 183u, 184u, 191u, 192u, |
- 199u, 200u, 207u, 208u, 215u, 216u, 223u, 232u, |
- 239u, 240u, 247u, 248u, 255u, 4u, 5u, 12u, |
+ 199u, 200u, 207u, 208u, 215u, 216u, 223u, 224u, |
+ 231u, 232u, 239u, 248u, 255u, 4u, 5u, 12u, |
13u, 20u, 21u, 28u, 29u, 36u, 37u, 44u, |
45u, 52u, 53u, 60u, 61u, 68u, 76u, 84u, |
92u, 100u, 108u, 116u, 124u, 132u, 140u, 148u, |
@@ -13326,8 +13330,8 @@ |
111u, 112u, 119u, 120u, 127u, 128u, 135u, 136u, |
143u, 144u, 151u, 152u, 159u, 160u, 167u, 168u, |
175u, 176u, 183u, 184u, 191u, 192u, 199u, 200u, |
- 207u, 208u, 215u, 216u, 223u, 232u, 239u, 240u, |
- 247u, 248u, 255u, 4u, 5u, 12u, 13u, 20u, |
+ 207u, 208u, 215u, 216u, 223u, 224u, 231u, 232u, |
+ 239u, 240u, 247u, 4u, 5u, 12u, 13u, 20u, |
21u, 28u, 29u, 36u, 37u, 44u, 45u, 52u, |
53u, 60u, 61u, 68u, 76u, 84u, 92u, 100u, |
108u, 116u, 124u, 132u, 140u, 148u, 156u, 164u, |
@@ -14661,8 +14665,8 @@ |
119u, 120u, 127u, 128u, 135u, 136u, 143u, 144u, |
151u, 152u, 159u, 160u, 167u, 168u, 175u, 176u, |
183u, 184u, 191u, 192u, 199u, 200u, 207u, 208u, |
- 215u, 216u, 223u, 224u, 231u, 232u, 239u, 248u, |
- 255u, 5u, 13u, 21u, 29u, 37u, 45u, 53u, |
+ 215u, 216u, 223u, 224u, 231u, 232u, 239u, 240u, |
+ 247u, 5u, 13u, 21u, 29u, 37u, 45u, 53u, |
61u, 69u, 77u, 85u, 93u, 101u, 109u, 117u, |
125u, 133u, 141u, 149u, 157u, 165u, 173u, 181u, |
189u, 197u, 205u, 213u, 221u, 229u, 237u, 245u, |
@@ -25725,34 +25729,34 @@ |
84u, 92u, 140u, 148u, 156u, 8u, 15u, 16u, |
23u, 24u, 31u, 72u, 79u, 80u, 87u, 88u, |
95u, 136u, 143u, 144u, 151u, 152u, 159u, 200u, |
- 207u, 208u, 215u, 216u, 223u, 0u, 1u, 2u, |
- 3u, 4u, 6u, 7u, 8u, 9u, 10u, 11u, |
- 12u, 14u, 15u, 16u, 17u, 18u, 19u, 20u, |
- 22u, 23u, 24u, 25u, 26u, 27u, 28u, 30u, |
- 31u, 32u, 33u, 34u, 35u, 36u, 38u, 39u, |
- 40u, 41u, 42u, 43u, 44u, 46u, 47u, 48u, |
- 49u, 50u, 51u, 52u, 54u, 55u, 56u, 57u, |
- 58u, 59u, 60u, 62u, 63u, 64u, 65u, 66u, |
- 67u, 68u, 70u, 71u, 72u, 73u, 74u, 75u, |
- 76u, 78u, 79u, 80u, 81u, 82u, 83u, 84u, |
- 86u, 87u, 88u, 89u, 90u, 91u, 92u, 94u, |
- 95u, 96u, 97u, 98u, 99u, 100u, 102u, 103u, |
- 104u, 105u, 106u, 107u, 108u, 110u, 111u, 112u, |
- 113u, 114u, 115u, 116u, 118u, 119u, 120u, 121u, |
- 122u, 123u, 124u, 125u, 126u, 127u, 128u, 129u, |
- 130u, 131u, 132u, 134u, 135u, 136u, 137u, 138u, |
- 139u, 140u, 142u, 143u, 144u, 145u, 146u, 147u, |
- 148u, 150u, 151u, 152u, 153u, 154u, 155u, 156u, |
- 158u, 159u, 160u, 161u, 162u, 163u, 164u, 166u, |
- 167u, 168u, 169u, 170u, 171u, 172u, 174u, 175u, |
- 176u, 177u, 178u, 179u, 180u, 182u, 183u, 184u, |
- 185u, 186u, 187u, 188u, 190u, 191u, 192u, 193u, |
- 194u, 195u, 196u, 198u, 199u, 200u, 201u, 202u, |
- 203u, 204u, 206u, 207u, 208u, 209u, 210u, 211u, |
- 212u, 214u, 215u, 216u, 217u, 218u, 219u, 220u, |
- 222u, 223u, 224u, 225u, 226u, 227u, 228u, 230u, |
- 231u, 232u, 233u, 234u, 235u, 236u, 238u, 239u, |
- 240u, 241u, 242u, 243u, 244u, 246u, 247u, 248u, |
+ 207u, 208u, 215u, 216u, 223u, 1u, 2u, 3u, |
+ 4u, 5u, 6u, 7u, 9u, 10u, 11u, 12u, |
+ 13u, 14u, 15u, 17u, 18u, 19u, 20u, 21u, |
+ 22u, 23u, 25u, 26u, 27u, 28u, 29u, 30u, |
+ 31u, 33u, 34u, 35u, 36u, 37u, 38u, 39u, |
+ 41u, 42u, 43u, 44u, 45u, 46u, 47u, 49u, |
+ 50u, 51u, 52u, 53u, 54u, 55u, 57u, 58u, |
+ 59u, 60u, 61u, 62u, 63u, 65u, 66u, 67u, |
+ 68u, 69u, 70u, 71u, 73u, 74u, 75u, 76u, |
+ 77u, 78u, 79u, 81u, 82u, 83u, 84u, 85u, |
+ 86u, 87u, 89u, 90u, 91u, 92u, 93u, 94u, |
+ 95u, 97u, 98u, 99u, 100u, 101u, 102u, 103u, |
+ 105u, 106u, 107u, 108u, 109u, 110u, 111u, 113u, |
+ 114u, 115u, 116u, 117u, 118u, 119u, 120u, 121u, |
+ 122u, 123u, 124u, 125u, 126u, 127u, 129u, 130u, |
+ 131u, 132u, 133u, 134u, 135u, 137u, 138u, 139u, |
+ 140u, 141u, 142u, 143u, 145u, 146u, 147u, 148u, |
+ 149u, 150u, 151u, 153u, 154u, 155u, 156u, 157u, |
+ 158u, 159u, 161u, 162u, 163u, 164u, 165u, 166u, |
+ 167u, 169u, 170u, 171u, 172u, 173u, 174u, 175u, |
+ 177u, 178u, 179u, 180u, 181u, 182u, 183u, 185u, |
+ 186u, 187u, 188u, 189u, 190u, 191u, 193u, 194u, |
+ 195u, 196u, 197u, 198u, 199u, 201u, 202u, 203u, |
+ 204u, 205u, 206u, 207u, 209u, 210u, 211u, 212u, |
+ 213u, 214u, 215u, 217u, 218u, 219u, 220u, 221u, |
+ 222u, 223u, 225u, 226u, 227u, 228u, 229u, 230u, |
+ 231u, 233u, 234u, 235u, 236u, 237u, 238u, 239u, |
+ 241u, 242u, 243u, 244u, 245u, 246u, 247u, 248u, |
249u, 250u, 251u, 252u, 253u, 254u, 255u, 0u, |
1u, 8u, 9u, 15u, 16u, 17u, 24u, 25u, |
32u, 33u, 40u, 41u, 48u, 49u, 102u, 128u, |
@@ -29117,8 +29121,8 @@ |
2818, 2820, 2765, 2768, 2771, 2774, 2777, 2780, |
2783, 2786, 2789, 2791, 2793, 2795, 2797, 2799, |
2801, 2803, 2805, 2807, 2809, 2811, 2813, 2815, |
- 2817, 2819, 2821, 2822, 2823, 2824, 2825, 2826, |
- 2827, 2828, 2830, 2830, 2830, 2830, 2830, 2830, |
+ 2817, 2819, 2821, 2822, 2823, 2824, 2825, 2827, |
+ 2828, 2826, 2830, 2830, 2830, 2830, 2830, 2830, |
2830, 2830, 2830, 2830, 2830, 2830, 2830, 2830, |
2830, 2830, 2830, 2830, 2830, 2830, 2830, 2830, |
2830, 2830, 2830, 2830, 2830, 2830, 2830, 2830, |
@@ -29132,7 +29136,7 @@ |
2854, 2857, 2860, 2863, 2866, 2869, 2872, 2875, |
2877, 2879, 2881, 2883, 2885, 2887, 2889, 2891, |
2893, 2895, 2897, 2899, 2901, 2903, 2905, 2907, |
- 2908, 2909, 2910, 2912, 2913, 2914, 2911, 2916, |
+ 2908, 2909, 2910, 2911, 2912, 2913, 2914, 2916, |
2916, 2916, 2916, 2916, 2916, 2916, 2916, 2916, |
2916, 2916, 2916, 2916, 2916, 2916, 2916, 2916, |
2916, 2916, 2916, 2916, 2916, 2916, 2916, 2916, |
@@ -29146,8 +29150,8 @@ |
2986, 2988, 2990, 2992, 2937, 2940, 2943, 2946, |
2949, 2952, 2955, 2958, 2961, 2963, 2965, 2967, |
2969, 2971, 2973, 2975, 2977, 2979, 2981, 2983, |
- 2985, 2987, 2989, 2991, 2993, 2994, 2995, 2996, |
- 2997, 2999, 3000, 2998, 3002, 3003, 3002, 3003, |
+ 2985, 2987, 2989, 2991, 2993, 2995, 2996, 2997, |
+ 2998, 2999, 3000, 2994, 3002, 3003, 3002, 3003, |
3002, 3003, 3002, 3003, 3002, 3003, 3002, 3003, |
3002, 3003, 3002, 3003, 3005, 3005, 3005, 3005, |
3005, 3005, 3005, 3005, 3007, 3007, 3007, 3007, |
@@ -29719,7 +29723,7 @@ |
4834, 4837, 4840, 4843, 4846, 4849, 4852, 4854, |
4856, 4858, 4860, 4862, 4864, 4866, 4868, 4870, |
4872, 4874, 4876, 4878, 4880, 4882, 4884, 4885, |
- 4886, 4887, 4889, 4890, 4891, 4888, 4893, 4894, |
+ 4886, 4887, 4888, 4889, 4891, 4890, 4893, 4894, |
4896, 4897, 4899, 4900, 4902, 4903, 4905, 4906, |
4908, 4909, 4911, 4912, 4914, 4915, 4917, 4919, |
4921, 4923, 4925, 4927, 4929, 4931, 4933, 4935, |
@@ -29727,7 +29731,7 @@ |
4898, 4901, 4904, 4907, 4910, 4913, 4916, 4918, |
4920, 4922, 4924, 4926, 4928, 4930, 4932, 4934, |
4936, 4938, 4940, 4942, 4944, 4946, 4948, 4949, |
- 4950, 4951, 4953, 4954, 4955, 4952, 4957, 4958, |
+ 4950, 4951, 4952, 4953, 4954, 4955, 4957, 4958, |
4957, 4958, 4957, 4958, 4957, 4958, 4957, 4958, |
4957, 4958, 4957, 4958, 4957, 4958, 4960, 4960, |
4960, 4960, 4960, 4960, 4960, 4960, 4962, 4962, |
@@ -30989,7 +30993,7 @@ |
7639, 7642, 7645, 7648, 7651, 7654, 7656, 7658, |
7660, 7662, 7664, 7666, 7668, 7670, 7672, 7674, |
7676, 7678, 7680, 7682, 7684, 7686, 7687, 7688, |
- 7689, 7690, 7691, 7693, 7692, 7695, 7695, 7695, |
+ 7689, 7690, 7691, 7692, 7693, 7695, 7695, 7695, |
7695, 7695, 7695, 7695, 7695, 7695, 7695, 7695, |
7695, 7695, 7695, 7695, 7695, 7695, 7695, 7695, |
7695, 7695, 7695, 7695, 7695, 7695, 7695, 7695, |
@@ -41854,35 +41858,35 @@ |
117, 17312, 17382, 17313, 17383, 17314, 17384, 17295, |
17296, 17297, 17298, 17299, 17300, 17354, 17355, 17356, |
17357, 17358, 17359, 17360, 17361, 17362, 17363, 17364, |
- 17365, 117, 17385, 17386, 17387, 17388, 17389, 17391, |
- 17392, 17385, 17386, 17387, 17388, 17389, 17391, 17392, |
- 17385, 17386, 17387, 17388, 17389, 17391, 17392, 17385, |
- 17386, 17387, 17388, 17389, 17391, 17392, 17385, 17386, |
- 17387, 17388, 17389, 17391, 17392, 17385, 17386, 17387, |
- 17388, 17389, 17391, 17392, 17385, 17386, 17387, 17388, |
- 17389, 17391, 17392, 17385, 17386, 17387, 17388, 17389, |
- 17391, 17392, 17385, 17386, 17387, 17388, 17389, 17391, |
- 17392, 17385, 17386, 17387, 17388, 17389, 17391, 17392, |
- 17385, 17386, 17387, 17388, 17389, 17391, 17392, 17385, |
- 17386, 17387, 17388, 17389, 17391, 17392, 17385, 17386, |
- 17387, 17388, 17389, 17391, 17392, 17385, 17386, 17387, |
- 17388, 17389, 17391, 17392, 17385, 17386, 17387, 17388, |
- 17389, 17391, 17392, 17393, 17394, 17395, 17396, 17397, |
- 17398, 17399, 17400, 17385, 17401, 17387, 17388, 17389, |
- 17391, 17392, 17385, 17401, 17387, 17388, 17389, 17391, |
- 17392, 17385, 17401, 17387, 17388, 17389, 17391, 17392, |
- 17385, 17401, 17387, 17388, 17389, 17391, 17392, 17385, |
- 17401, 17387, 17388, 17389, 17391, 17392, 17385, 17401, |
- 17387, 17388, 17389, 17391, 17392, 17385, 17401, 17387, |
- 17388, 17389, 17391, 17392, 17385, 17401, 17387, 17388, |
- 17389, 17391, 17392, 17385, 17401, 17387, 17388, 17389, |
- 17391, 17392, 17385, 17401, 17387, 17388, 17389, 17391, |
- 17392, 17385, 17401, 17387, 17388, 17389, 17391, 17392, |
- 17385, 17401, 17387, 17388, 17389, 17391, 17392, 17385, |
- 17401, 17387, 17388, 17389, 17391, 17392, 17385, 17401, |
- 17387, 17388, 17389, 17391, 17392, 17385, 17401, 17387, |
- 17388, 17389, 17391, 17392, 17402, 17403, 17395, 17396, |
- 17404, 17398, 17399, 17400, 17390, 17405, 17406, 17407, |
+ 17365, 117, 17386, 17387, 17388, 17389, 17390, 17391, |
+ 17392, 17386, 17387, 17388, 17389, 17390, 17391, 17392, |
+ 17386, 17387, 17388, 17389, 17390, 17391, 17392, 17386, |
+ 17387, 17388, 17389, 17390, 17391, 17392, 17386, 17387, |
+ 17388, 17389, 17390, 17391, 17392, 17386, 17387, 17388, |
+ 17389, 17390, 17391, 17392, 17386, 17387, 17388, 17389, |
+ 17390, 17391, 17392, 17386, 17387, 17388, 17389, 17390, |
+ 17391, 17392, 17386, 17387, 17388, 17389, 17390, 17391, |
+ 17392, 17386, 17387, 17388, 17389, 17390, 17391, 17392, |
+ 17386, 17387, 17388, 17389, 17390, 17391, 17392, 17386, |
+ 17387, 17388, 17389, 17390, 17391, 17392, 17386, 17387, |
+ 17388, 17389, 17390, 17391, 17392, 17386, 17387, 17388, |
+ 17389, 17390, 17391, 17392, 17386, 17387, 17388, 17389, |
+ 17390, 17391, 17392, 17393, 17394, 17395, 17396, 17397, |
+ 17398, 17399, 17400, 17401, 17387, 17388, 17389, 17390, |
+ 17391, 17392, 17401, 17387, 17388, 17389, 17390, 17391, |
+ 17392, 17401, 17387, 17388, 17389, 17390, 17391, 17392, |
+ 17401, 17387, 17388, 17389, 17390, 17391, 17392, 17401, |
+ 17387, 17388, 17389, 17390, 17391, 17392, 17401, 17387, |
+ 17388, 17389, 17390, 17391, 17392, 17401, 17387, 17388, |
+ 17389, 17390, 17391, 17392, 17401, 17387, 17388, 17389, |
+ 17390, 17391, 17392, 17401, 17387, 17388, 17389, 17390, |
+ 17391, 17392, 17401, 17387, 17388, 17389, 17390, 17391, |
+ 17392, 17401, 17387, 17388, 17389, 17390, 17391, 17392, |
+ 17401, 17387, 17388, 17389, 17390, 17391, 17392, 17401, |
+ 17387, 17388, 17389, 17390, 17391, 17392, 17401, 17387, |
+ 17388, 17389, 17390, 17391, 17392, 17401, 17387, 17388, |
+ 17389, 17390, 17391, 17392, 17402, 17403, 17395, 17396, |
+ 17404, 17398, 17399, 17400, 17385, 17405, 17406, 17407, |
17408, 17409, 17410, 17411, 17412, 17413, 17414, 17415, |
17416, 17417, 17418, 17419, 17422, 17423, 17424, 17425, |
17426, 17427, 17428, 17429, 17430, 17431, 17420, 17421, |
@@ -47565,11 +47569,19 @@ |
instruction.prefix.rex_r_spurious = FALSE; |
instruction.prefix.rex_w_spurious = FALSE; |
+ /* |
+ * The "write init" statement causes Ragel to emit initialization code. |
+ * This should be executed once before the ragel machine is started. |
+ */ |
{ |
( current_state) = x86_64_decoder_start; |
} |
+ /* |
+ * The "write exec" statement causes Ragel to emit the ragel machine's |
+ * execution code. |
+ */ |
{ |
int _klen; |