5 files changed, 27 insertions, 20 deletions

diff --git a/src/storage/chewing_large_table.cpp b/src/storage/chewing_large_table.cpp
index e856caf..bd76e9b 100644
--- a/src/storage/chewing_large_table.cpp
+++ b/src/storage/chewing_large_table.cpp
@@ -804,7 +804,7 @@ bool ChewingBitmapIndexLevel::store(MemoryChunk * new_chunk,
 bool ChewingLengthIndexLevel::load(MemoryChunk * chunk, table_offset_t offset,
                                    table_offset_t end) {
     char * begin = (char *) chunk->begin();
-    guint32 nindex = *((guint32 *)(begin + offset)); /* number of index */
+    guint32 nindex = chunk->get_content<guint32>(offset); /* number of index */
     table_offset_t * index = (table_offset_t *)
         (begin + offset + sizeof(guint32));
 
diff --git a/src/storage/ngram.cpp b/src/storage/ngram.cpp
index c952768..e4bfe8f 100644
--- a/src/storage/ngram.cpp
+++ b/src/storage/ngram.cpp
@@ -46,14 +46,12 @@ SingleGram::SingleGram(void * buffer, size_t length, bool copy){
 }
 
 bool SingleGram::get_total_freq(guint32 & total) const{
-    char * buf_begin = (char *)m_chunk.begin();
-    total = *((guint32 *)buf_begin);
+    total = m_chunk.get_content<guint32>(0);
     return true;
 }
 
 bool SingleGram::set_total_freq(guint32 total){
-    char * buf_begin = (char *)m_chunk.begin();
-    *((guint32 *)buf_begin) = total;
+    m_chunk.set_content<guint32>(0, total);
     return true;
 }
 
diff --git a/src/storage/phrase_index.cpp b/src/storage/phrase_index.cpp
index e9e9d5d..de864c2 100644
--- a/src/storage/phrase_index.cpp
+++ b/src/storage/phrase_index.cpp
@@ -20,6 +20,7 @@
 
 #include "phrase_index.h"
 #include "pinyin_custom2.h"
+#include "unaligned_memory.h"
 
 namespace pinyin{
 
@@ -61,10 +62,12 @@ bool PhraseItem::add_pronunciation(ChewingKey * keys, guint32 delta){
     for (int i = 0; i < npron; ++i) {
         char * chewing_begin = buf_begin + offset +
             i * (phrase_length * sizeof(ChewingKey) + sizeof(guint32));
-        guint32 * freq = (guint32 *)(chewing_begin +
-                                     phrase_length * sizeof(ChewingKey));
+        
+        guint32 * pfreq = (guint32 *)(chewing_begin +
+                                      phrase_length * sizeof(ChewingKey));
+        guint32 freq = UnalignedMemory<guint32>::load(pfreq);
 
-        total_freq += *freq;
+        total_freq += freq;
 
         if (0 == pinyin_exact_compare2
             (keys, (ChewingKey *)chewing_begin, phrase_length)) {
@@ -74,8 +77,9 @@ bool PhraseItem::add_pronunciation(ChewingKey * keys, guint32 delta){
             if (delta > 0 && total_freq > total_freq + delta)
                 return false;
 
-            *freq += delta;
+            freq += delta;
             total_freq += delta;
+            UnalignedMemory<guint32>::store(freq, pfreq);
             return true;
         }
     }
@@ -117,9 +121,11 @@ void PhraseItem::increase_pronunciation_possibility(ChewingKey * keys,
     for (int i = 0; i < npron; ++i) {
         char * chewing_begin = buf_begin + offset +
             i * (phrase_length * sizeof(ChewingKey) + sizeof(guint32));
-        guint32 * freq = (guint32 *)(chewing_begin +
-                                     phrase_length * sizeof(ChewingKey));
-        total_freq += *freq;
+        
+        guint32 * pfreq = (guint32 *)(chewing_begin +
+                                      phrase_length * sizeof(ChewingKey));
+        guint32 freq = UnalignedMemory<guint32>::load(pfreq);
+        total_freq += freq;
 
         if (0 == pinyin_compare_with_tones(keys, (ChewingKey *)chewing_begin,
                                            phrase_length)) {
@@ -128,8 +134,9 @@ void PhraseItem::increase_pronunciation_possibility(ChewingKey * keys,
             if (delta > 0 && total_freq > total_freq + delta)
                 return;
 
-            *freq += delta;
+            freq += delta;
             total_freq += delta;
+            UnalignedMemory<guint32>::store(freq, pfreq);
         }
     }
 }
diff --git a/src/storage/phrase_index.h b/src/storage/phrase_index.h
index 83dfb51..7e910ed 100644
--- a/src/storage/phrase_index.h
+++ b/src/storage/phrase_index.h
@@ -31,6 +31,7 @@
 #include "memory_chunk.h"
 #include "phrase_index_logger.h"
 #include "table_info.h"
+#include "unaligned_memory.h"
 
 /**
  * Phrase Index File Format
@@ -121,8 +122,7 @@ public:
      *
      */
     guint32 get_unigram_frequency(){
-        char * buf_begin = (char *)m_chunk.begin();
-        return (*(guint32 *)(buf_begin + sizeof(guint8) + sizeof(guint8)));
+        return m_chunk.get_content<guint32>(sizeof(guint8) + sizeof(guint8));
     }
 
     /**
@@ -142,12 +142,13 @@ public:
         for ( int i = 0 ; i < npron ; ++i){
             char * chewing_begin = buf_begin + offset +
                 i * (phrase_length * sizeof(ChewingKey) + sizeof(guint32));
-            guint32 * freq = (guint32 *)(chewing_begin +
-                                         phrase_length * sizeof(ChewingKey));
-            total_freq += *freq;
+            
+            guint32 freq = UnalignedMemory<guint32>::load(chewing_begin +
+                                                          phrase_length * sizeof(ChewingKey));
+            total_freq += freq;
             if ( 0 == pinyin_compare_with_tones(keys, (ChewingKey *)chewing_begin,
                                                 phrase_length) ){
-                matched += *freq;
+                matched += freq;
             }
         }
 
diff --git a/src/storage/phrase_large_table2.cpp b/src/storage/phrase_large_table2.cpp
index b72917c..28eb313 100644
--- a/src/storage/phrase_large_table2.cpp
+++ b/src/storage/phrase_large_table2.cpp
@@ -561,7 +561,8 @@ bool PhraseLengthIndexLevel2::load(MemoryChunk * chunk,
                                    table_offset_t offset,
                                    table_offset_t end) {
     char * buf_begin = (char *) chunk->begin();
-    guint32 nindex = *((guint32 *)(buf_begin + offset));
+    guint32 nindex = chunk->get_content<guint32>(offset);
+
     table_offset_t * index = (table_offset_t *)
         (buf_begin + offset + sizeof(guint32));