From cd0c6e148f6d078b364370cb2f808b793b921be2 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 9 Aug 2012 21:48:55 -0400 Subject: [PATCH] Shuffle buffer variable allocations around To room for more allocations, coming. --- src/hb-ot-layout-private.hh | 6 +++--- src/hb-ot-shape-complex-arabic.cc | 2 +- src/hb-ot-shape-complex-indic-private.hh | 4 ++-- src/hb-ot-shape-complex-private.hh | 5 ++--- src/hb-ot-shape-private.hh | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/hb-ot-layout-private.hh b/src/hb-ot-layout-private.hh index 510aec9..e101782 100644 --- a/src/hb-ot-layout-private.hh +++ b/src/hb-ot-layout-private.hh @@ -39,9 +39,9 @@ /* buffer var allocations, used during the GSUB/GPOS processing */ -#define glyph_props() var1.u16[1] /* GDEF glyph properties */ -#define syllable() var2.u8[0] /* GSUB/GPOS shaping boundaries */ -#define lig_props() var2.u8[1] /* GSUB/GPOS ligature tracking */ +#define glyph_props() var1.u16[0] /* GDEF glyph properties */ +#define syllable() var1.u8[2] /* GSUB/GPOS shaping boundaries */ +#define lig_props() var1.u8[3] /* GSUB/GPOS ligature tracking */ #define hb_ot_layout_from_face(face) ((hb_ot_layout_t *) face->shaper_data.ot) diff --git a/src/hb-ot-shape-complex-arabic.cc b/src/hb-ot-shape-complex-arabic.cc index b014c74..2a96b7d 100644 --- a/src/hb-ot-shape-complex-arabic.cc +++ b/src/hb-ot-shape-complex-arabic.cc @@ -30,7 +30,7 @@ /* buffer var allocations */ -#define arabic_shaping_action() complex_var_temporary_u8() /* arabic shaping action */ +#define arabic_shaping_action() complex_var_u8_0() /* arabic shaping action */ /* diff --git a/src/hb-ot-shape-complex-indic-private.hh b/src/hb-ot-shape-complex-indic-private.hh index 719d287..79daba5 100644 --- a/src/hb-ot-shape-complex-indic-private.hh +++ b/src/hb-ot-shape-complex-indic-private.hh @@ -35,8 +35,8 @@ /* buffer var allocations */ -#define indic_category() complex_var_persistent_u8_0() /* indic_category_t */ -#define indic_position() complex_var_persistent_u8_1() /* indic_matra_category_t */ +#define indic_category() complex_var_u8_0() /* indic_category_t */ +#define indic_position() complex_var_u8_1() /* indic_matra_category_t */ #define INDIC_TABLE_ELEMENT_TYPE uint8_t diff --git a/src/hb-ot-shape-complex-private.hh b/src/hb-ot-shape-complex-private.hh index baece32..efff325 100644 --- a/src/hb-ot-shape-complex-private.hh +++ b/src/hb-ot-shape-complex-private.hh @@ -35,9 +35,8 @@ /* buffer var allocations, used by complex shapers */ -#define complex_var_persistent_u8_0() var2.u8[2] -#define complex_var_persistent_u8_1() var2.u8[3] -#define complex_var_temporary_u8() var2.u8[0] +#define complex_var_u8_0() var2.u8[2] +#define complex_var_u8_1() var2.u8[3] diff --git a/src/hb-ot-shape-private.hh b/src/hb-ot-shape-private.hh index 975665e..f856045 100644 --- a/src/hb-ot-shape-private.hh +++ b/src/hb-ot-shape-private.hh @@ -34,8 +34,8 @@ /* buffer var allocations, used during the entire shaping process */ -#define unicode_props0() var1.u8[0] -#define unicode_props1() var1.u8[1] +#define unicode_props0() var2.u8[0] +#define unicode_props1() var2.u8[1] -- 2.7.4