about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorptitSeb <sebastien.chev@gmail.com>2021-07-05 16:24:31 +0200
committerptitSeb <sebastien.chev@gmail.com>2021-07-05 16:24:31 +0200
commite3bbfe30524edf2d3a5b0dc2e701b5aff95b5e6a (patch)
tree32f7699d88ff19c0d44474ff1342a88cea274fc0
parent85a460afb7002509c189bceec0c6746602441fa9 (diff)
downloadbox64-e3bbfe30524edf2d3a5b0dc2e701b5aff95b5e6a.tar.gz
box64-e3bbfe30524edf2d3a5b0dc2e701b5aff95b5e6a.zip
Added more xkbcommon wrapped functions (for #29)
-rw-r--r--src/wrapped/generated/functions_list.txt1
-rw-r--r--src/wrapped/generated/wrapper.c3
-rw-r--r--src/wrapped/generated/wrapper.h1
-rw-r--r--src/wrapped/wrappedxkbcommon_private.h12
4 files changed, 11 insertions, 6 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 8192cd9d..d6ee9090 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -276,6 +276,7 @@
 #() iFuup
 #() iFuff
 #() iFuLL
+#() iFupL
 #() iFfff
 #() iFLwp
 #() iFLip
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 4e91ddf5..7b5366ca 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -310,6 +310,7 @@ typedef int64_t (*iFuuu_t)(uint64_t, uint64_t, uint64_t);
 typedef int64_t (*iFuup_t)(uint64_t, uint64_t, void*);
 typedef int64_t (*iFuff_t)(uint64_t, float, float);
 typedef int64_t (*iFuLL_t)(uint64_t, uintptr_t, uintptr_t);
+typedef int64_t (*iFupL_t)(uint64_t, void*, uintptr_t);
 typedef int64_t (*iFfff_t)(float, float, float);
 typedef int64_t (*iFLwp_t)(uintptr_t, int16_t, void*);
 typedef int64_t (*iFLip_t)(uintptr_t, int64_t, void*);
@@ -1644,6 +1645,7 @@ void iFuuu(x64emu_t *emu, uintptr_t fcn) { iFuuu_t fn = (iFuuu_t)fcn; R_RAX=(int
 void iFuup(x64emu_t *emu, uintptr_t fcn) { iFuup_t fn = (iFuup_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI, (void*)R_RDX); }
 void iFuff(x64emu_t *emu, uintptr_t fcn) { iFuff_t fn = (iFuff_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0]); }
 void iFuLL(x64emu_t *emu, uintptr_t fcn) { iFuLL_t fn = (iFuLL_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX); }
+void iFupL(x64emu_t *emu, uintptr_t fcn) { iFupL_t fn = (iFupL_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void iFfff(x64emu_t *emu, uintptr_t fcn) { iFfff_t fn = (iFfff_t)fcn; R_RAX=(int64_t)fn(emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0]); }
 void iFLwp(x64emu_t *emu, uintptr_t fcn) { iFLwp_t fn = (iFLwp_t)fcn; R_RAX=(int64_t)fn((uintptr_t)R_RDI, (int16_t)R_RSI, (void*)R_RDX); }
 void iFLip(x64emu_t *emu, uintptr_t fcn) { iFLip_t fn = (iFLip_t)fcn; R_RAX=(int64_t)fn((uintptr_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX); }
@@ -2945,6 +2947,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFuup) return 1;
 	if (fun == &iFuff) return 3;
 	if (fun == &iFuLL) return 1;
+	if (fun == &iFupL) return 1;
 	if (fun == &iFfff) return 4;
 	if (fun == &iFLwp) return 1;
 	if (fun == &iFLip) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 4e18f5b9..bfd287f3 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -306,6 +306,7 @@ void iFuuu(x64emu_t *emu, uintptr_t fnc);
 void iFuup(x64emu_t *emu, uintptr_t fnc);
 void iFuff(x64emu_t *emu, uintptr_t fnc);
 void iFuLL(x64emu_t *emu, uintptr_t fnc);
+void iFupL(x64emu_t *emu, uintptr_t fnc);
 void iFfff(x64emu_t *emu, uintptr_t fnc);
 void iFLwp(x64emu_t *emu, uintptr_t fnc);
 void iFLip(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedxkbcommon_private.h b/src/wrapped/wrappedxkbcommon_private.h
index a5de5f67..103122a5 100644
--- a/src/wrapped/wrappedxkbcommon_private.h
+++ b/src/wrapped/wrappedxkbcommon_private.h
@@ -58,12 +58,12 @@ GO(xkb_keymap_num_levels_for_key, uFpuu)
 GO(xkb_keymap_num_mods, uFp)
 GO(xkb_keymap_ref, pFp)
 GO(xkb_keymap_unref, vFp)
-//GO(xkb_keysym_from_name, 
-//GO(xkb_keysym_get_name, 
-//GO(xkb_keysym_to_lower, 
-//GO(xkb_keysym_to_upper, 
-//GO(xkb_keysym_to_utf32, 
-//GO(xkb_keysym_to_utf8, 
+GO(xkb_keysym_from_name, uFpi)
+GO(xkb_keysym_get_name, iFupL)
+GO(xkb_keysym_to_lower, uFu)
+GO(xkb_keysym_to_upper, uFu)
+GO(xkb_keysym_to_utf32, uFu)
+GO(xkb_keysym_to_utf8, iFupL)
 GO(xkb_state_get_keymap, pFp)
 GO(xkb_state_key_get_consumed_mods, uFpu)
 GO(xkb_state_key_get_consumed_mods2, uFpui)