Merge branch 'master' into blub/bc3

diff --cc ir.c
index 1bf5513de82df32c00b76b6bd28495e3c4c48c79,6a6d51a9b65506c5be9719104982ea26e00d839e..612ce90e1e6400f4582fbcda5231c5641071ca57
--- 1/ir.c
--- 2/ir.c
+++ b/ir.c
@@@ -56,15 -54,12 +56,15 @@@ uint16_t type_store_instr[TYPE_COUNT] 
      INSTR_STORE_FNC,
      INSTR_STORE_ENT, /* should use I */
  #if 0
 -    INSTR_STORE_ENT, /* integer type */
 +    INSTR_STORE_I, /* integer type */
  #endif
 -    INSTR_STORE_V, /* variant, should never be accessed */
 +    INSTR_STORE_Q,
 +    INSTR_STORE_M,
 +
 +    INSTR_STORE_M, /* variant, should never be accessed */
  };
  
- uint16_t type_store_instr[TYPE_COUNT] = {
+ uint16_t type_storep_instr[TYPE_COUNT] = {
      INSTR_STOREP_F, /* should use I when having integer support */
      INSTR_STOREP_S,
      INSTR_STOREP_F,