Commits

ecsv committed 6d23f96

Add C conversion of MiClWr8b assembler functions

  • Participants
  • Parent commits 03fb7b5

Comments (0)

Files changed (2)

projects/unix/Makefile

 #CFLAGS += -DOLDASM_asmLoad8bIA8
 #CFLAGS += -DOLDASM_asmLoad8bIA4
 #CFLAGS += -DOLDASM_asmLoad8bI
+#CFLAGS += -DOLDASM_asmMirror8bS
+#CFLAGS += -DOLDASM_asmWrap8bS
+#CFLAGS += -DOLDASM_asmClamp8bS
 #CFLAGS += -DOLDASM_asmLoadBlock
 #CFLAGS += -DOLDASM_asmLoadTile
 

src/Glide64/MiClWr8b.h

 //****************************************************************
 // 8-bit Horizontal Mirror
 
+extern "C" void asmMirror8bS(uint8_t *tex, uint8_t *start, int width, int height, int mask, int line, int full, int count);
+extern "C" void asmWrap8bS(uint8_t *tex, uint8_t *start, int height, int mask, int line, int full, int count);
+extern "C" void asmClamp8bS(uint8_t *tex, uint8_t *constant, int height, int line, int full, int count);
+
+static inline void mirror8bS(uint8_t *tex, uint8_t *start, int width, int height, int mask, int line, int full, int count)
+{
+  uint8_t *v8;
+  int v9;
+  int v10;
+
+  v8 = start;
+  v9 = height;
+  do
+  {
+    v10 = 0;
+    do
+    {
+      if ( width & (v10 + width) )
+        *v8++ = *(&tex[mask] - (mask & v10));
+      else
+        *v8++ = tex[mask & v10];
+      ++v10;
+    }
+    while ( v10 != count );
+    v8 += line;
+    tex += full;
+    --v9;
+  }
+  while ( v9 );
+}
+
+static inline void wrap8bS(uint8_t *tex, uint8_t *start, int height, int mask, int line, int full, int count)
+{
+  uint32_t *v7;
+  int v8;
+  int v9;
+
+  v7 = (uint32_t *)start;
+  v8 = height;
+  do
+  {
+    v9 = 0;
+    do
+    {
+      *v7 = *(uint32_t *)&tex[4 * (mask & v9)];
+      ++v7;
+      ++v9;
+    }
+    while ( v9 != count );
+    v7 = (uint32_t *)((char *)v7 + line);
+    tex += full;
+    --v8;
+  }
+  while ( v8 );
+}
+
+static inline void clamp8bS(uint8_t *tex, uint8_t *constant, int height, int line, int full, int count)
+{
+  uint8_t *v6;
+  uint8_t *v7;
+  int v8;
+  uint8_t v9;
+  int v10;
+
+  v6 = constant;
+  v7 = tex;
+  v8 = height;
+  do
+  {
+    v9 = *v6;
+    v10 = count;
+    do
+    {
+      *v7++ = v9;
+      --v10;
+    }
+    while ( v10 );
+    v6 += full;
+    v7 += line;
+    --v8;
+  }
+  while ( v8 );
+}
+
 void Mirror8bS (unsigned char * tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_width, wxUint32 height)
 {
-    if (mask == 0) return;
+  if (mask == 0) return;
 
-    wxUint32 mask_width = (1 << mask);
-    wxUint32 mask_mask = (mask_width-1);
-    if (mask_width >= max_width) return;
-    int count = max_width - mask_width;
-    if (count <= 0) return;
-    int line_full = real_width;
-    int line = line_full - (count);
-    if (line < 0) return;
-    unsigned char * start = tex + (mask_width);
-    
-    //   asmMirror8bS (tex, start, mask_width, height, mask_mask, line, line_full, count);
-    
-    unsigned char *edi = start;
-    
-    for(unsigned int ecx = height; ecx; --ecx) {
-      for(int edx = 0; edx != count; ++edx) {
-        
-        unsigned char *esi = tex;
-        if((mask_width + edx) & mask_width) {
-          esi += (mask_mask - (edx & mask_mask));
-        }
-        else
-        {
-          esi += (edx & mask_mask);
-        }
-        *edi = *esi;
-        edi++;
-      }
-      edi += line;
-      tex += line_full;
-    }
+  wxUint32 mask_width = (1 << mask);
+  wxUint32 mask_mask = (mask_width-1);
+  if (mask_width >= max_width) return;
+  int count = max_width - mask_width;
+  if (count <= 0) return;
+  int line_full = real_width;
+  int line = line_full - (count);
+  if (line < 0) return;
+  unsigned char * start = tex + (mask_width);
+#ifdef OLDASM_asmMirror8bS
+  asmMirror8bS (tex, start, mask_width, height, mask_mask, line, line_full, count);
+#else
+  mirror8bS (tex, start, mask_width, height, mask_mask, line, line_full, count);
+#endif
+}
+
+//****************************************************************
+// 8-bit Horizontal Wrap (like mirror) ** UNTESTED **
+
+
+void Wrap8bS (unsigned char * tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_width, wxUint32 height)
+{
+  if (mask == 0) return;
+
+  wxUint32 mask_width = (1 << mask);
+  wxUint32 mask_mask = (mask_width-1) >> 2;
+  if (mask_width >= max_width) return;
+  int count = (max_width - mask_width) >> 2;
+  if (count <= 0) return;
+  int line_full = real_width;
+  int line = line_full - (count << 2);
+  if (line < 0) return;
+  unsigned char * start = tex + (mask_width);
+#ifdef OLDASM_asmWrap8bS
+  asmWrap8bS (tex, start, height, mask_mask, line, line_full, count);
+#else
+  wrap8bS (tex, start, height, mask_mask, line, line_full, count);
+#endif
+}
+
+//****************************************************************
+// 8-bit Horizontal Clamp
+
+
+void Clamp8bS (unsigned char * tex, wxUint32 width, wxUint32 clamp_to, wxUint32 real_width, wxUint32 real_height)
+{
+  if (real_width <= width) return;
+
+  unsigned char * dest = tex + (width);
+  unsigned char * constant = dest-1;
+  int count = clamp_to - width;
+
+  int line_full = real_width;
+  int line = width;
+#ifdef OLDASM_asmClamp8bS
+  asmClamp8bS (dest, constant, real_height, line, line_full, count);
+#else
+  clamp8bS (dest, constant, real_height, line, line_full, count);
+#endif
 }
 
 //****************************************************************
 
 void Mirror8bT (unsigned char * tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_width)
 {
-    if (mask == 0) return;
+  if (mask == 0) return;
 
-    wxUint32 mask_height = (1 << mask);
-    wxUint32 mask_mask = mask_height-1;
-    if (max_height <= mask_height) return;
-    int line_full = real_width;
+  wxUint32 mask_height = (1 << mask);
+  wxUint32 mask_mask = mask_height-1;
+  if (max_height <= mask_height) return;
+  int line_full = real_width;
 
-    unsigned char * dst = tex + mask_height * line_full;
+  unsigned char * dst = tex + mask_height * line_full;
 
-    for (wxUint32 y=mask_height; y<max_height; y++)
+  for (wxUint32 y=mask_height; y<max_height; y++)
+  {
+    if (y & mask_height)
     {
-        if (y & mask_height)
-        {
-            // mirrored
-            memcpy ((void*)dst, (void*)(tex + (mask_mask - (y & mask_mask)) * line_full), line_full);
-        }
-        else
-        {
-            // not mirrored
-            memcpy ((void*)dst, (void*)(tex + (y & mask_mask) * line_full), line_full);
-        }
+      // mirrored
+      memcpy ((void*)dst, (void*)(tex + (mask_mask - (y & mask_mask)) * line_full), line_full);
+    }
+    else
+    {
+      // not mirrored
+      memcpy ((void*)dst, (void*)(tex + (y & mask_mask) * line_full), line_full);
+    }
 
-        dst += line_full;
-    }
-}
-
-//****************************************************************
-// 8-bit Horizontal Wrap (like mirror) ** UNTESTED **
-
-
-void Wrap8bS (unsigned char * tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_width, wxUint32 height)
-{
-    if (mask == 0) return;
-
-    wxUint32 mask_width = (1 << mask);
-    wxUint32 mask_mask = (mask_width-1) >> 2;
-    if (mask_width >= max_width) return;
-    int count = (max_width - mask_width) >> 2;
-    if (count <= 0) return;
-    int line_full = real_width;
-    int line = line_full - (count << 2);
-    if (line < 0) return;
-    unsigned char * start = tex + (mask_width);
-    
-    wxUint32 *edi = (wxUint32 *)start;
-    
-    for(wxUint32 ecx = height; ecx; ecx--) {
-      for(wxUint32 edx = 0; edx != count; edx++) {
-        wxUint32 *esi = (wxUint32 *)tex;
-        esi += (edx & mask_mask);
-        *edi = *esi;
-        edi++;
-      }
-      edi += line >> 2;
-      tex += line_full >> 2;
-    }
+    dst += line_full;
+  }
 }
 
 //****************************************************************
 
 void Wrap8bT (unsigned char * tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_width)
 {
-    if (mask == 0) return;
+  if (mask == 0) return;
 
-    wxUint32 mask_height = (1 << mask);
-    wxUint32 mask_mask = mask_height-1;
-    if (max_height <= mask_height) return;
-    int line_full = real_width;
+  wxUint32 mask_height = (1 << mask);
+  wxUint32 mask_mask = mask_height-1;
+  if (max_height <= mask_height) return;
+  int line_full = real_width;
 
-    unsigned char * dst = tex + mask_height * line_full;
+  unsigned char * dst = tex + mask_height * line_full;
 
-    for (wxUint32 y=mask_height; y<max_height; y++)
-    {
-        // not mirrored
-        memcpy ((void*)dst, (void*)(tex + (y & mask_mask) * line_full), line_full);
+  for (wxUint32 y=mask_height; y<max_height; y++)
+  {
+    // not mirrored
+    memcpy ((void*)dst, (void*)(tex + (y & mask_mask) * line_full), line_full);
 
-        dst += line_full;
-    }
-}
-
-//****************************************************************
-// 8-bit Horizontal Clamp
-
-
-void Clamp8bS (unsigned char * tex, wxUint32 width, wxUint32 clamp_to, wxUint32 real_width, wxUint32 real_height)
-{
-    if (real_width <= width) return;
-
-    unsigned char * dest = tex + (width);
-    unsigned char * constant = dest-1;
-    int count = clamp_to - width;
-
-    int line_full = real_width;
-    int line = width;
-    
-//   asmClamp8bS (dest, constant, real_height, line, line_full, count);
-
-    for(wxUint32 ecx = real_height; ecx; ecx--) {
-      for(wxUint32 edx = count; edx; edx--) {
-        *dest = *constant;
-        dest++;
-      }
-      constant += line_full;
-      dest += line;
-    }
+    dst += line_full;
+  }
 }
 
 //****************************************************************
 
 void Clamp8bT (unsigned char * tex, wxUint32 height, wxUint32 real_width, wxUint32 clamp_to)
 {
-    int line_full = real_width;
-    unsigned char * dst = tex + height * line_full;
-    unsigned char * const_line = dst - line_full;
+  int line_full = real_width;
+  unsigned char * dst = tex + height * line_full;
+  unsigned char * const_line = dst - line_full;
 
-    for (wxUint32 y=height; y<clamp_to; y++)
-    {
-        memcpy ((void*)dst, (void*)const_line, line_full);
-        dst += line_full;
-    }
+  for (wxUint32 y=height; y<clamp_to; y++)
+  {
+    memcpy ((void*)dst, (void*)const_line, line_full);
+    dst += line_full;
+  }
 }