Changeset 7f079d9 in mainline

Timestamp:

2006-06-03T01:24:33Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0861786

Parents:

6c46350

Message:

Tetris now works on mips on gxemul on both console & framebuffer.
It doesn't work in msim, but it seems to be msim bug this time.

Files:

• libc/generic/string.c (modified) (2 diffs)
• tetris/tetris.c (modified) (1 diff)

libc/generic/string.c

@@ -31 +31 @@
 #include <ctype.h>
 #include <limits.h>
+#include <align.h>
 
 
@@ -43 +44 @@
 }
 
+struct along {unsigned long n; } __attribute__ ((packed));
+
+static void * unaligned_memcpy(void *dst, const void *src, size_t n)
+{
+        int i, j;
+        struct along *adst = dst;
+        const struct along *asrc = src;
+
+        for (i = 0; i < n/sizeof(unsigned long); i++)
+                adst[i].n = asrc[i].n;
+                
+        for (j = 0; j < n%sizeof(unsigned long); j++)
+                ((unsigned char *)(((unsigned long *) dst) + i))[j] = ((unsigned char *)(((unsigned long *) src) + i))[j];
+                
+        return (char *)src;
+}
+
 void * memcpy(void *dst, const void *src, size_t n)
 {
         int i, j;
+
+        if (((long)dst & (sizeof(long)-1)) || ((long)src & (sizeof(long)-1)))
+                return unaligned_memcpy(dst, src, n);
 
         for (i = 0; i < n/sizeof(unsigned long); i++)

tetris/tetris.c

@@ -345 +345 @@
                     score, score == 1 ? "" : "s", level, score * level);
         else {
-                (void)printf("Your score:  %d point%s x level %d x preview penalty %0.3f = %d\n",
-                    score, score == 1 ? "" : "s", level, (double)PRE_PENALTY,
-                    (int)(score * level * PRE_PENALTY));
-                score = score * PRE_PENALTY;
+/*              (void)printf("Your score:  %d point%s x level %d x preview penalty %0.3f = %d\n", */
+/*                  score, score == 1 ? "" : "s", level, (double)PRE_PENALTY, */
+/*                  (int)(score * level * PRE_PENALTY)); */
+/*              score = score * PRE_PENALTY; */
         }
         savescore(level);