xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Never grow the DualThreadStack in push_next

Browse Source 
As we do at most one push_next per step_thread, and we pop_current
before step_thread, we can avoid a branch there at the expense of
sometimes growing unecessarily (once).
This commit is contained in:
Maxime Coste 2018-11-06 07:32:47 +11:00
parent 7fbde0d44e
commit 05a9eb62f4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/regex_impl.hh
View File

@ -464,6 +464,7 @@ private:
kak_assert(m_threads.current_is_empty() and m_threads.next_is_empty()); kak_assert(m_threads.current_is_empty() and m_threads.next_is_empty());
release_saves(m_captures); release_saves(m_captures);
m_captures = -1; m_captures = -1;
m_threads.grow_ifn();
m_threads.push_current({static_cast<int16_t>(&config.instructions[0] - &m_program.instructions[0]), -1}); m_threads.push_current({static_cast<int16_t>(&config.instructions[0] - &m_program.instructions[0]), -1});
const auto& start_desc = forward ? m_program.forward_start_desc : m_program.backward_start_desc; const auto& start_desc = forward ? m_program.forward_start_desc : m_program.backward_start_desc;
@ -624,10 +625,10 @@ private:
bool current_is_empty() const { return m_current == 0; } bool current_is_empty() const { return m_current == 0; }
bool next_is_empty() const { return m_next == m_capacity; } bool next_is_empty() const { return m_next == m_capacity; }
void push_current(Thread thread) { grow_ifn(); m_data[m_current++] = thread; } void push_current(Thread thread) { kak_assert(m_current < m_next); m_data[m_current++] = thread; grow_ifn(); }
Thread pop_current() { kak_assert(m_current > 0); return m_data[--m_current]; } Thread pop_current() { kak_assert(m_current > 0); return m_data[--m_current]; }
void push_next(Thread thread) { grow_ifn(); m_data[--m_next] = thread; } void push_next(Thread thread) { kak_assert(m_current < m_next); m_data[--m_next] = thread; }
void clear_next() { m_next = m_capacity; } void clear_next() { m_next = m_capacity; }
ConstArrayView<Thread> next_threads() const { return { m_data + m_next, m_data + m_capacity }; } ConstArrayView<Thread> next_threads() const { return { m_data + m_next, m_data + m_capacity }; }
@ -641,7 +642,6 @@ private:
while (m_next < m_capacity); while (m_next < m_capacity);
} }
private:
void grow_ifn() void grow_ifn()
{ {
if (m_current != m_next) if (m_current != m_next)
@ -656,6 +656,7 @@ private:
m_next = new_next; m_next = new_next;
} }
private:
Thread* m_data = nullptr; Thread* m_data = nullptr;
int32_t m_capacity = 0; // Maximum capacity should be 2*instruction count, so 65536 int32_t m_capacity = 0; // Maximum capacity should be 2*instruction count, so 65536
int32_t m_current = 0; int32_t m_current = 0;