input: move the bind labels out of struct retro_keybind

struct retro_keybind was 48 bytes, of which the first 16 were two char*
holding human-readable names for the bound button and axis. Nothing in
the poll path ever reads them; they exist for the menu and for config
write-out. Meanwhile input_config_binds and input_autoconf_binds are
16 users x 96 binds each, and input_driver_collect_system_input alone
sweeps a user's set five times per frame.

Hold the labels in input_bind_label_set arrays parallel to the two bind
sets instead. struct retro_keybind drops 48 -> 28 bytes, so a user's
bind set goes 4608 -> 2688 bytes, 72 -> 42 cache lines. Total BSS for
the four arrays is ~12KB lower than the two it replaces.

The labels are reached by (user, id) everywhere they are used, so the
display helpers take a struct input_bind_label alongside the bind. It
may be NULL: menu_driver.c formats a transient bind built on the stack
during bind capture, which has no entry in the arrays and no labels.
config_save_file's minimal-mode snapshot keeps its deep copy semantics,
duplicating label strings into a parallel heap set and handing ownership
back on restore, exactly as it did when they lived in the bind.

config.def.keybinds.h initialised all 383 default binds positionally
with a leading "NULL, NULL," for the two pointers; those are dropped
with the fields. Verified with -Wextra that no entry is left short.

No functional change. Verified against a binary built from the parent
commit, driven through config load, keybind parse, label storage and
write-out: a 4-player matrix of 88 button and axis labels round-trips to
a byte-identical saved config (3516 lines), and again in minimal mode
(270 lines, 88 labels), which is the path that exercises the snapshot
deep copy. Under valgrind both builds produce identical output: same
single pre-existing error, 0 bytes definitely lost, 179258 bytes still
reachable in 103 blocks. Full tree builds and links clean.

configuration.c

@@ -7679,16 +7679,16 @@ static void save_keybind_joykey(config_file_t *conf,
 static void save_keybind_joykey_label(config_file_t *conf,
       const char *prefix,
       const char *base,
-      const struct retro_keybind *bind)
+      const struct input_bind_label *label)
 {
    char key[64];
    size_t _len = fill_pathname_join_delim(key, prefix,
          base, '_', sizeof(key));
    _len += strlcpy(key + _len, "_btn", sizeof(key) - _len);
-   if (bind->joykey_label && *bind->joykey_label)
+   if (label->joykey && *label->joykey)
    {
       strlcpy(key + _len, "_label", sizeof(key) - _len);
-      config_set_string(conf, key, bind->joykey_label);
+      config_set_string(conf, key, label->joykey);
    }
 }
 
@@ -7726,15 +7726,15 @@ static void save_keybind_axis(config_file_t *conf,
 static void save_keybind_axis_label(config_file_t *conf,
       const char *prefix,
       const char *base,
-      const struct retro_keybind *bind)
+      const struct input_bind_label *label)
 {
    char key[64];
    size_t _len = fill_pathname_join_delim(key, prefix, base, '_', sizeof(key));
    _len += strlcpy(key + _len, "_axis", sizeof(key) - _len);
-   if (bind->joyaxis_label && *bind->joyaxis_label)
+   if (label->joyaxis && *label->joyaxis)
    {
       strlcpy(key + _len, "_label", sizeof(key) - _len);
-      config_set_string(conf, key, bind->joyaxis_label);
+      config_set_string(conf, key, label->joyaxis);
    }
 }
 
@@ -8053,19 +8053,21 @@ bool config_save_autoconf_profile(const char *device_name, unsigned user)
    {
       struct retro_keybind *bind      = &input_config_binds[user][i];
       struct retro_keybind *auto_bind = &input_autoconf_binds[user][i];
+      struct input_bind_label *lbl    = &input_config_bind_labels[user][i];
+      struct input_bind_label *albl   = &input_autoconf_bind_labels[user][i];
 
       if (bind->joykey == NO_BTN && auto_bind->joykey != NO_BTN)
       {
          bind->joykey = auto_bind->joykey;
-         if (auto_bind->joykey_label && *auto_bind->joykey_label)
-            bind->joykey_label = strdup(auto_bind->joykey_label);
+         if (albl->joykey && *albl->joykey)
+            lbl->joykey = strdup(albl->joykey);
       }
 
       if (bind->joyaxis == AXIS_NONE && auto_bind->joyaxis != AXIS_NONE)
       {
          bind->joyaxis = auto_bind->joyaxis;
-         if (auto_bind->joyaxis_label && *auto_bind->joyaxis_label)
-            bind->joyaxis_label = strdup(auto_bind->joyaxis_label);
+         if (albl->joyaxis && *albl->joyaxis)
+            lbl->joyaxis = strdup(albl->joyaxis);
       }
    }
 
@@ -8135,19 +8137,20 @@ input_config_get_device_display_name(settings->uints.input_joypad_index[user]);
    {
       unsigned id                      = input_config_bind_order[i];
       const struct retro_keybind *bind = &input_config_binds[user][id];
+      struct input_bind_label *lbl     = &input_config_bind_labels[user][id];
 
       if (bind->valid)
       {
-         if (bind->joykey_label && *bind->joykey_label)
+         if (lbl->joykey && *lbl->joykey)
          {
-            save_keybind_joykey_label(conf, "input", input_config_bind_map_get_base(id), bind);
-            free(bind->joykey_label);
+            save_keybind_joykey_label(conf, "input", input_config_bind_map_get_base(id), lbl);
+            free(lbl->joykey);
          }
 
-         if (bind->joyaxis_label && *bind->joyaxis_label)
+         if (lbl->joyaxis && *lbl->joyaxis)
          {
-            save_keybind_axis_label(conf, "input", input_config_bind_map_get_base(id), bind);
-            free(bind->joyaxis_label);
+            save_keybind_axis_label(conf, "input", input_config_bind_map_get_base(id), lbl);
+            free(lbl->joyaxis);
          }
       }
    }
@@ -8294,6 +8297,8 @@ bool config_save_file(const char *path)
             input_driver_state_t *input_st = input_state_get_ptr();
             input_device_info_t saved_device_info[MAX_INPUT_DEVICES];
             retro_keybind_set *saved_autoconf_binds;
+            input_bind_label_set *saved_autoconf_labels;
+            input_bind_label_set *saved_config_labels;
             /* Heap-allocated: MAX_USERS * sizeof(retro_keybind_set) is
              * ~51KB, too large for the stack on small-stack platforms.
              * Matches defaults_binds / saved_autoconf_binds above. */
@@ -8308,9 +8313,19 @@ bool config_save_file(const char *path)
                memcpy(saved_binds, input_config_binds,
                      MAX_USERS * sizeof(retro_keybind_set));
 
+            /* Config-bind labels are saved and restored by value, exactly as
+             * they were when they lived inside the bind struct. */
+            saved_config_labels = (input_bind_label_set*)calloc(MAX_USERS,
+                  sizeof(input_bind_label_set));
+            if (saved_config_labels)
+               memcpy(saved_config_labels, input_config_bind_labels,
+                     MAX_USERS * sizeof(input_bind_label_set));
+
             /* Save current input_autoconf_binds (deep copy with string duplication) */
-            saved_autoconf_binds = (retro_keybind_set*)calloc(MAX_USERS, sizeof(retro_keybind_set));
-            if (saved_autoconf_binds)
+            saved_autoconf_binds  = (retro_keybind_set*)calloc(MAX_USERS, sizeof(retro_keybind_set));
+            saved_autoconf_labels = (input_bind_label_set*)calloc(MAX_USERS,
+                  sizeof(input_bind_label_set));
+            if (saved_autoconf_binds && saved_autoconf_labels)
             {
                for (i = 0; i < MAX_USERS; i++)
                {
@@ -8320,17 +8335,17 @@ bool config_save_file(const char *path)
                      memcpy(&saved_autoconf_binds[i][j], &input_autoconf_binds[i][j],
                             sizeof(struct retro_keybind));
                      /* Duplicate allocated strings (don't share pointers!) */
-                     if (input_autoconf_binds[i][j].joykey_label)
-                        saved_autoconf_binds[i][j].joykey_label =
-                           strdup(input_autoconf_binds[i][j].joykey_label);
+                     if (input_autoconf_bind_labels[i][j].joykey)
+                        saved_autoconf_labels[i][j].joykey =
+                           strdup(input_autoconf_bind_labels[i][j].joykey);
                      else
-                        saved_autoconf_binds[i][j].joykey_label = NULL;
+                        saved_autoconf_labels[i][j].joykey = NULL;
 
-                     if (input_autoconf_binds[i][j].joyaxis_label)
-                        saved_autoconf_binds[i][j].joyaxis_label =
-                           strdup(input_autoconf_binds[i][j].joyaxis_label);
+                     if (input_autoconf_bind_labels[i][j].joyaxis)
+                        saved_autoconf_labels[i][j].joyaxis =
+                           strdup(input_autoconf_bind_labels[i][j].joyaxis);
                      else
-                        saved_autoconf_binds[i][j].joyaxis_label = NULL;
+                        saved_autoconf_labels[i][j].joyaxis = NULL;
                   }
                }
             }
@@ -8357,6 +8372,13 @@ bool config_save_file(const char *path)
                free(saved_binds);
             }
 
+            if (saved_config_labels)
+            {
+               memcpy(input_config_bind_labels, saved_config_labels,
+                     MAX_USERS * sizeof(input_bind_label_set));
+               free(saved_config_labels);
+            }
+
             /* Restore input_device_info */
             memcpy(input_st->input_device_info, saved_device_info,
                    sizeof(saved_device_info));
@@ -8367,26 +8389,34 @@ bool config_save_file(const char *path)
 #endif
 
             /* Restore input_autoconf_binds (free strings allocated by input_config_reset, then restore) */
-            if (saved_autoconf_binds)
+            if (saved_autoconf_binds && saved_autoconf_labels)
             {
                for (i = 0; i < MAX_USERS; i++)
                {
                   for (j = 0; j < RARCH_BIND_LIST_END; j++)
                   {
                      /* Free strings allocated by input_config_reset() */
-                     if (input_autoconf_binds[i][j].joykey_label)
-                        free(input_autoconf_binds[i][j].joykey_label);
-                     if (input_autoconf_binds[i][j].joyaxis_label)
-                        free(input_autoconf_binds[i][j].joyaxis_label);
+                     if (input_autoconf_bind_labels[i][j].joykey)
+                        free(input_autoconf_bind_labels[i][j].joykey);
+                     if (input_autoconf_bind_labels[i][j].joyaxis)
+                        free(input_autoconf_bind_labels[i][j].joyaxis);
 
                      /* Restore saved bind (with our duplicated strings) */
                      memcpy(&input_autoconf_binds[i][j], &saved_autoconf_binds[i][j],
                             sizeof(struct retro_keybind));
+                     input_autoconf_bind_labels[i][j] = saved_autoconf_labels[i][j];
                   }
                }
 
-               /* Free the temporary backup array (strings are now owned by input_autoconf_binds) */
+               /* Free the temporary backup arrays (strings are now owned by
+                * input_autoconf_bind_labels) */
                free(saved_autoconf_binds);
+               free(saved_autoconf_labels);
+            }
+            else
+            {
+               free(saved_autoconf_binds);
+               free(saved_autoconf_labels);
             }
          }
 
@@ -9972,16 +10002,16 @@ void input_config_reset_autoconfig_binds(unsigned port)
       input_autoconf_binds[port][i].joyaxis = AXIS_NONE;
       input_autoconf_binds[port][i].valid   = false;
 
-      if (input_autoconf_binds[port][i].joykey_label)
+      if (input_autoconf_bind_labels[port][i].joykey)
       {
-         free(input_autoconf_binds[port][i].joykey_label);
-         input_autoconf_binds[port][i].joykey_label = NULL;
+         free(input_autoconf_bind_labels[port][i].joykey);
+         input_autoconf_bind_labels[port][i].joykey = NULL;
       }
 
-      if (input_autoconf_binds[port][i].joyaxis_label)
+      if (input_autoconf_bind_labels[port][i].joyaxis)
       {
-         free(input_autoconf_binds[port][i].joyaxis_label);
-         input_autoconf_binds[port][i].joyaxis_label = NULL;
+         free(input_autoconf_bind_labels[port][i].joyaxis);
+         input_autoconf_bind_labels[port][i].joyaxis = NULL;
       }
    }
 
@@ -10011,14 +10041,16 @@ void input_config_set_autoconfig_binds(unsigned port, void *data)
    };
    size_t i;
    config_file_t *config       = (config_file_t*)data;
-   struct retro_keybind *binds = NULL;
+   struct retro_keybind *binds     = NULL;
+   struct input_bind_label *labels = NULL;
    input_driver_state_t *input_st;
    input_sensor_map_t *map;
 
    if ((port >= MAX_USERS) || !config)
       return;
 
-   binds = input_autoconf_binds[port];
+   binds  = input_autoconf_binds[port];
+   labels = input_autoconf_bind_labels[port];
 
    for (i = 0; i < RARCH_BIND_LIST_END; i++)
    {
@@ -10030,8 +10062,10 @@ void input_config_set_autoconfig_binds(unsigned port, void *data)
          const char *base = keybind->base;
          fill_pathname_join_delim(str, "input", base,  '_', sizeof(str));
 
-         input_config_parse_joy_button(str, config, "input", base, &binds[i]);
-         input_config_parse_joy_axis  (str, config, "input", base, &binds[i]);
+         input_config_parse_joy_button(str, config, "input", base, &binds[i],
+               &labels[i]);
+         input_config_parse_joy_axis  (str, config, "input", base, &binds[i],
+               &labels[i]);
       }
    }
 
@@ -10124,8 +10158,9 @@ void input_config_parse_mouse_button(char *s,
 
 void input_config_parse_joy_axis(char *s,
       void *conf_data, const char *prefix,
-      const char *axis, void *bind_data)
+      const char *axis, void *bind_data, void *label_data)
 {
+   struct input_bind_label *label = (struct input_bind_label*)label_data;
    char tmp[64];
    char key[64];
    config_file_t *conf             = (config_file_t*)conf_data;
@@ -10167,9 +10202,9 @@ void input_config_parse_joy_axis(char *s,
 
    if (tmp_a && tmp_a->value && *tmp_a->value)
    {
-      if (bind->joyaxis_label && *bind->joyaxis_label)
-         free(bind->joyaxis_label);
-      bind->joyaxis_label = strdup(tmp_a->value);
+      if (label->joyaxis && *label->joyaxis)
+         free(label->joyaxis);
+      label->joyaxis = strdup(tmp_a->value);
    }
 }
 
@@ -10212,8 +10247,9 @@ static uint16_t input_config_parse_hat(const char *dir)
 void input_config_parse_joy_button(
       char *s,
       void *data, const char *prefix,
-      const char *btn, void *bind_data)
+      const char *btn, void *bind_data, void *label_data)
 {
+   struct input_bind_label *label = (struct input_bind_label*)label_data;
    char tmp[64], key[64];
    config_file_t *conf             = (config_file_t*)data;
    struct retro_keybind *bind      = (struct retro_keybind*)bind_data;
@@ -10254,9 +10290,9 @@ void input_config_parse_joy_button(
    tmp_a = config_get_entry(conf, key);
    if (tmp_a && tmp_a->value && *tmp_a->value)
    {
-      if (bind->joykey_label && *bind->joykey_label)
-         free(bind->joykey_label);
-      bind->joykey_label = strdup(tmp_a->value);
+      if (label->joykey && *label->joykey)
+         free(label->joykey);
+      label->joykey = strdup(tmp_a->value);
    }
 }
 

configuration.h

@@ -1467,12 +1467,14 @@ bool input_config_bind_map_get_valid(unsigned bind_index);
 void input_config_parse_joy_button(
       char *s,
       void *data, const char *prefix,
-      const char *btn, void *bind_data);
+      const char *btn, void *bind_data,
+      void *label_data);
 
 void input_config_parse_joy_axis(
       char *s,
       void *conf_data, const char *prefix,
-      const char *axis, void *bind_data);
+      const char *axis, void *bind_data,
+      void *label_data);
 
 void input_config_parse_mouse_button(
       char *s,

input/input_driver.c

@@ -164,6 +164,8 @@ const unsigned input_config_bind_order[24] = {
 /* TODO/FIXME - turn these into static global variable */
 retro_keybind_set input_config_binds[MAX_USERS];
 retro_keybind_set input_autoconf_binds[MAX_USERS];
+input_bind_label_set input_config_bind_labels[MAX_USERS];
+input_bind_label_set input_autoconf_bind_labels[MAX_USERS];
 uint64_t lifecycle_state                                        = 0;
 
 static void *input_null_init(const char *joypad_driver) { return (void*)-1; }
@@ -4481,6 +4483,8 @@ size_t input_config_get_bind_string(
       char *s,
       const struct retro_keybind *bind,
       const struct retro_keybind *auto_bind,
+      const struct input_bind_label *label,
+      const struct input_bind_label *auto_label,
       size_t len)
 {
    settings_t *settings                 = (settings_t*)settings_data;
@@ -4494,19 +4498,19 @@ size_t input_config_get_bind_string(
    if      (bind      && bind->joykey  != NO_BTN)
       _len = input_config_get_bind_string_joykey(
             input_descriptor_label_show,
-            s, "", bind, len);
+            s, "", bind, label, len);
    else if (bind      && bind->joyaxis != AXIS_NONE)
       _len = input_config_get_bind_string_joyaxis(
             input_descriptor_label_show,
-            s, "", bind, len);
+            s, "", bind, label, len);
    else if (auto_bind && auto_bind->joykey != NO_BTN)
       _len = input_config_get_bind_string_joykey(
             input_descriptor_label_show,
-            s, "(Auto)", auto_bind, len);
+            s, "(Auto)", auto_bind, auto_label, len);
    else if (auto_bind && auto_bind->joyaxis != AXIS_NONE)
       _len = input_config_get_bind_string_joyaxis(
             input_descriptor_label_show,
-            s, "(Auto)", auto_bind, len);
+            s, "(Auto)", auto_bind, auto_label, len);
 
    if (*s)
       delim = 1;
@@ -4586,16 +4590,18 @@ size_t input_config_get_bind_string(
 size_t input_config_get_bind_string_joykey(
       bool input_descriptor_label_show,
       char *s, const char *suffix,
-      const struct retro_keybind *bind, size_t len)
+      const struct retro_keybind *bind,
+      const struct input_bind_label *label, size_t len)
 {
+   const char *joykey_label = label ? label->joykey : NULL;
    size_t _len = 0;
    if (GET_HAT_DIR(bind->joykey))
    {
-      if (      bind->joykey_label
-            && (bind->joykey_label && *bind->joykey_label)
+      if (      joykey_label
+            && (joykey_label && *joykey_label)
             && input_descriptor_label_show)
          return fill_pathname_join_delim(s,
-               bind->joykey_label, suffix, ' ', len);
+               joykey_label, suffix, ' ', len);
       /* TODO/FIXME - localize */
       _len  = snprintf(s, len,
             "Hat #%u ", (unsigned)GET_HAT(bind->joykey));
@@ -4620,11 +4626,11 @@ size_t input_config_get_bind_string_joykey(
    }
    else
    {
-      if (      bind->joykey_label
-            && (bind->joykey_label && *bind->joykey_label)
+      if (      joykey_label
+            && (joykey_label && *joykey_label)
             && input_descriptor_label_show)
          return fill_pathname_join_delim(s,
-               bind->joykey_label, suffix, ' ', len);
+               joykey_label, suffix, ' ', len);
 
       /* TODO/FIXME - localize */
       _len  = strlcpy(s, "Button ", len);
@@ -4641,14 +4647,16 @@ size_t input_config_get_bind_string_joykey(
 size_t input_config_get_bind_string_joyaxis(
       bool input_descriptor_label_show,
       char *s, const char *suffix,
-      const struct retro_keybind *bind, size_t len)
+      const struct retro_keybind *bind,
+      const struct input_bind_label *label, size_t len)
 {
+   const char *joyaxis_label = label ? label->joyaxis : NULL;
    size_t _len = 0;
-   if (      bind->joyaxis_label
-         && (bind->joyaxis_label && *bind->joyaxis_label)
+   if (      joyaxis_label
+         && (joyaxis_label && *joyaxis_label)
          && input_descriptor_label_show)
       return fill_pathname_join_delim(s,
-            bind->joyaxis_label, suffix, ' ', len);
+            joyaxis_label, suffix, ' ', len);
 
    /* TODO/FIXME - localize */
    _len = strlcpy(s, "Axis ", len);
@@ -5997,8 +6005,10 @@ void config_read_keybinds_conf(void *data)
          input_keyboard_mapping_bits(1, bind->key);
          key_store[bind->key]       = true;
 
-         input_config_parse_joy_button  (str, conf, prefix, btn, bind);
-         input_config_parse_joy_axis    (str, conf, prefix, btn, bind);
+         input_config_parse_joy_button  (str, conf, prefix, btn, bind,
+               &input_config_bind_labels[i][j]);
+         input_config_parse_joy_axis    (str, conf, prefix, btn, bind,
+               &input_config_bind_labels[i][j]);
          input_config_parse_mouse_button(str, conf, prefix, btn, bind);
       }
    }

input/input_driver.h

@@ -1097,17 +1097,21 @@ void input_game_focus_free(void);
  */
 size_t input_config_get_bind_string(void *settings_data,
       char *s, const struct retro_keybind *bind,
-      const struct retro_keybind *auto_bind, size_t len);
+      const struct retro_keybind *auto_bind,
+      const struct input_bind_label *label,
+      const struct input_bind_label *auto_label, size_t len);
 
 size_t input_config_get_bind_string_joyaxis(
       bool input_descriptor_label_show,
       char *s, const char *prefix,
-      const struct retro_keybind *bind, size_t len);
+      const struct retro_keybind *bind,
+      const struct input_bind_label *label, size_t len);
 
 size_t input_config_get_bind_string_joykey(
       bool input_descriptor_label_show,
       char *s, const char *prefix,
-      const struct retro_keybind *bind, size_t len);
+      const struct retro_keybind *bind,
+      const struct input_bind_label *label, size_t len);
 
 bool input_key_pressed(int key, bool keyboard_pressed);
 
@@ -1294,6 +1298,8 @@ extern hid_driver_t wiiu_hid;
 
 extern retro_keybind_set input_config_binds[MAX_USERS];
 extern retro_keybind_set input_autoconf_binds[MAX_USERS];
+extern input_bind_label_set input_config_bind_labels[MAX_USERS];
+extern input_bind_label_set input_autoconf_bind_labels[MAX_USERS];
 
 RETRO_END_DECLS
 

input/input_types.h

@@ -70,12 +70,20 @@ struct hold_buttons
    bool frame_enable[MAX_USERS];     /* Hold modifier pressed this frame */
 };
 
+/* Human-readable names for a bind's joypad button and analog axis, supplied
+ * by an autoconfig profile or a config file. Display-only: nothing in the
+ * input poll path ever reads them, so they are held in arrays parallel to the
+ * bind sets rather than inside struct retro_keybind, which is swept in full
+ * several times per frame. Keeping the two pointers out of the bind takes it
+ * from 48 to 28 bytes. */
+struct input_bind_label
+{
+   char     *joykey;
+   char     *joyaxis;
+};
+
 struct retro_keybind
 {
-   /* Human-readable label for the control. */
-   char     *joykey_label;
-   /* Human-readable label for an analog axis. */
-   char     *joyaxis_label;
    /*
     * Joypad axis. Negative and positive axes are both 
     * represented by this variable.
@@ -100,6 +108,7 @@ struct retro_keybind
 };
 
 typedef struct retro_keybind retro_keybind_set[RARCH_BIND_LIST_END];
+typedef struct input_bind_label input_bind_label_set[RARCH_BIND_LIST_END];
 
 typedef struct
 {

menu/menu_displaylist.c

@@ -13003,7 +13003,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                               input_config_get_bind_auto(port, retro_id);
                         size_t desc_len = input_config_get_bind_string(
                               settings, descriptor,
-                              keybind, auto_bind, sizeof(descriptor));
+                              keybind, auto_bind,
+                              &input_config_bind_labels[port][retro_id],
+                              &input_autoconf_bind_labels[port][retro_id],
+                              sizeof(descriptor));
 
                         if (!strstr(descriptor, "Auto"))
                         {

menu/menu_driver.c

@@ -4922,8 +4922,10 @@ static bool menu_input_key_bind_iterate(
             new_binds.timer_hold.current        = current_time;
             new_binds.timer_hold.timeout_us     = new_binds.timer_hold.timeout_end - current_time;
 
+            /* Transient bind under capture: it lives on the stack and has
+             * no entry in the label arrays, so it carries no labels. */
             input_config_get_bind_string(settings, hold_label,
-                  &new_binds.buffer, NULL, sizeof(hold_label));
+                  &new_binds.buffer, NULL, NULL, NULL, sizeof(hold_label));
 
             snprintf(bind->s, bind->len,
                   "%s..\n(%s %1.1f %s)\n \n%s\n   %s",

menu/menu_setting.c

@@ -1341,7 +1341,12 @@ static size_t setting_get_string_representation_st_bind(rarch_setting_t *setting
    keybind      = (const struct retro_keybind*)setting->value.target.keybind;
    auto_bind    = (const struct retro_keybind*)
       input_config_get_bind_auto(index_offset, keybind->id);
-   return input_config_get_bind_string(settings, s, keybind, auto_bind, len);
+   if (keybind->id >= RARCH_BIND_LIST_END)
+      return input_config_get_bind_string(settings, s, keybind, auto_bind,
+            NULL, NULL, len);
+   return input_config_get_bind_string(settings, s, keybind, auto_bind,
+         &input_config_bind_labels[index_offset][keybind->id],
+         &input_autoconf_bind_labels[index_offset][keybind->id], len);
 }
 
 static int setting_action_action_ok(