SAA: optimize all power-of-two lengths

We can actually use the shift optimization whenever blk_len ==
SAA_BLKLEN, which will be true for all powers of two.

1 files changed, 2 insertions, 3 deletions

diff --git a/saa.c b/saa.c
index 046659e7..51123da1 100644
--- a/saa.c
+++ b/saa.c
@@ -211,7 +211,7 @@ void saa_fread(struct SAA *s, size_t posn, void *data, size_t len)
 	return;
     }
 
-    if (s->elem_len == 1) {
+    if (s->blk_len == SAA_BLKLEN) {
 	ix = posn >> SAA_BLKSHIFT;
 	s->rpos = posn & (SAA_BLKLEN-1);
     } else {
@@ -234,9 +234,8 @@ void saa_fwrite(struct SAA *s, size_t posn, const void *data, size_t len)
 	nasm_malloc_error(ERR_PANIC|ERR_NOFILE, "overrun in saa_fwrite");
 	return;
     }
-
     
-    if (s->elem_len == 1) {
+    if (s->blk_len == SAA_BLKLEN) {
 	ix = posn >> SAA_BLKSHIFT;
 	s->wpos = posn & (SAA_BLKLEN-1);
     } else {