aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-12-20 17:24:32 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-12-20 17:24:32 +0000
commit56faca42660d65aefc440a223aef6b5f9628cfd6 (patch)
tree5df5fa37ab6515661c18f1fbc819fb6dfea2ed9b
parentscript: generate-alt-random: reduce output size (diff)
vt: use a switch instead of a top-level state lookup table
Remove the top-level state lookup table, which mapped from a state enum to a state transition table, and replace it with a switch.
-rw-r--r--vt.c27
1 files changed, 26 insertions, 1 deletions
diff --git a/vt.c b/vt.c
index 38ce9f5f..7adab9d9 100644
--- a/vt.c
+++ b/vt.c
@@ -515,6 +515,7 @@ static const struct state_transition state_sos_pm_apc_string[256] = {
[0x9e ... 0x9f] = { .state = STATE_SOS_PM_APC_STRING},
};
+#if 0
static const struct state_transition* states[] = {
[STATE_GROUND] = state_ground,
[STATE_ESCAPE] = state_escape,
@@ -531,6 +532,7 @@ static const struct state_transition* states[] = {
[STATE_DCS_PASSTHROUGH] = state_dcs_passthrough,
[STATE_SOS_PM_APC_STRING] = state_sos_pm_apc_string,
};
+#endif
static const enum action entry_actions[] = {
[STATE_SAME] = ACTION_NONE,
@@ -1075,7 +1077,30 @@ vt_from_slave(struct terminal *term, const uint8_t *data, size_t len)
continue;
}
- const struct state_transition *transition = &states[current_state][data[i]];
+ const struct state_transition *table = NULL;
+
+ switch (current_state) {
+ case STATE_GROUND: table = state_ground; break;
+ case STATE_ESCAPE: table = state_escape; break;
+ case STATE_ESCAPE_INTERMEDIATE: table = state_escape_intermediate; break;
+ case STATE_CSI_ENTRY: table = state_csi_entry; break;
+ case STATE_CSI_PARAM: table = state_csi_param; break;
+ case STATE_CSI_INTERMEDIATE: table = state_csi_intermediate; break;
+ case STATE_CSI_IGNORE: table = state_csi_ignore; break;
+ case STATE_OSC_STRING: table = state_osc_string; break;
+ case STATE_DCS_ENTRY: table = state_dcs_entry; break;
+ case STATE_DCS_PARAM: table = state_dcs_param; break;
+ case STATE_DCS_INTERMEDIATE: table = state_dcs_intermediate; break;
+ case STATE_DCS_IGNORE: table = state_dcs_ignore; break;
+ case STATE_DCS_PASSTHROUGH: table = state_dcs_passthrough; break;
+ case STATE_SOS_PM_APC_STRING: table = state_sos_pm_apc_string; break;
+
+ case STATE_SAME:
+ case STATE_UTF8_COLLECT: assert(false); break;
+ }
+
+ assert(table != NULL);
+ const struct state_transition *transition = &table[data[i]];
if (transition->state != STATE_SAME) {
enum action exit_action = exit_actions[current_state];