Merge static-vars

TODO-s390

@@ -7,7 +7,6 @@ Todo:
 
 - fix qemu/target/s390x/cpu.c, so sample_s390x works
 - enable building all arch to fix conflicts
-- remove all static vars in qemu/target/s390x/translate.c [DONE in branch "static-vars"]
 - support more registers in qemu/target/s390x/unicorn.c
 - storage-keys needed?
 - find & fix potential memory leaking with valgrind

qemu/include/tcg/tcg.h

@@ -791,6 +791,19 @@ struct TCGContext {
     TCGv NULL_QREG;
     /* Used to distinguish stores from bad addressing modes.  */
     TCGv store_dummy;
+
+    // target/s390x/translate.c
+    TCGv_i64 psw_addr;
+    TCGv_i64 psw_mask;
+    TCGv_i64 gbea;
+
+    TCGv_i32 cc_op;
+    TCGv_i64 cc_src;
+    TCGv_i64 cc_dst;
+    TCGv_i64 cc_vr;
+
+    char s390x_cpu_reg_names[16][4]; // renamed from original cpu_reg_names[][] to avoid name clash with m68k
+    TCGv_i64 regs[16];
 };
 
 static inline size_t temp_idx(TCGContext *tcg_ctx, TCGTemp *ts)