From 7752ffc50cbdfd62533186ab9145269ec30371c3 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 23 Nov 2018 20:11:08 -0500
Subject: [PATCH] a64_emit_x64: Convert std::vector instances in
 GenFastmemFallbacks() to std::array

Given these are quite small, we can avoid the need to heap allocate
here.
---
 src/backend/x64/a64_emit_x64.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/backend/x64/a64_emit_x64.cpp b/src/backend/x64/a64_emit_x64.cpp
index da37ab68..0024d8d7 100644
--- a/src/backend/x64/a64_emit_x64.cpp
+++ b/src/backend/x64/a64_emit_x64.cpp
@@ -204,18 +204,18 @@ void A64EmitX64::GenMemory128Accessors() {
 
 void A64EmitX64::GenFastmemFallbacks() {
     const std::initializer_list<int> idxes{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-    const std::vector<std::tuple<size_t, ArgCallback>> read_callbacks {
+    const std::array<std::pair<size_t, ArgCallback>, 4> read_callbacks{{
         {8, Devirtualize<&A64::UserCallbacks::MemoryRead8>(conf.callbacks)},
         {16, Devirtualize<&A64::UserCallbacks::MemoryRead16>(conf.callbacks)},
         {32, Devirtualize<&A64::UserCallbacks::MemoryRead32>(conf.callbacks)},
         {64, Devirtualize<&A64::UserCallbacks::MemoryRead64>(conf.callbacks)},
-    };
-    const std::vector<std::tuple<size_t, ArgCallback>> write_callbacks {
+    }};
+    const std::array<std::pair<size_t, ArgCallback>, 4> write_callbacks{{
         {8, Devirtualize<&A64::UserCallbacks::MemoryWrite8>(conf.callbacks)},
         {16, Devirtualize<&A64::UserCallbacks::MemoryWrite16>(conf.callbacks)},
         {32, Devirtualize<&A64::UserCallbacks::MemoryWrite32>(conf.callbacks)},
         {64, Devirtualize<&A64::UserCallbacks::MemoryWrite64>(conf.callbacks)},
-    };
+    }};
 
     for (int vaddr_idx : idxes) {
         if (vaddr_idx == 4 || vaddr_idx == 15) {