mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

276 lines
11 KiB

  1. diff -ruN allegro-4.1.17/src/i386/blit.inc allegro-4.1.17-new/src/i386/blit.inc
  2. --- allegro-4.1.17/src/i386/blit.inc 2003-07-16 21:43:28.000000000 +0200
  3. +++ allegro-4.1.17-new/src/i386/blit.inc 2005-05-21 09:44:36.000000000 +0200
  4. @@ -39,23 +39,23 @@
  5. #define BLIT_LOOP(name, bpp, code) \
  6. blit_loop_##name: ; \
  7. - movl B_DEST, %edx /* destination bitmap */ ; \
  8. - movl B_DEST_Y, %eax /* line number */ ; \
  9. - movl B_DEST_X, %edi /* x offset */ ; \
  10. + mov B_DEST, %edx /* destination bitmap */ ; \
  11. + mov B_DEST_Y, %eax /* line number */ ; \
  12. + mov B_DEST_X, %edi /* x offset */ ; \
  13. WRITE_BANK() /* select bank */ ; \
  14. leal (%eax, %edi, bpp), %edi ; \
  15. ; \
  16. - movl B_SOURCE, %edx /* source bitmap */ ; \
  17. - movl B_SOURCE_Y, %eax /* line number */ ; \
  18. - movl B_SOURCE_X, %esi /* x offset */ ; \
  19. + mov B_SOURCE, %edx /* source bitmap */ ; \
  20. + mov B_SOURCE_Y, %eax /* line number */ ; \
  21. + mov B_SOURCE_X, %esi /* x offset */ ; \
  22. READ_BANK() /* select bank */ ; \
  23. leal (%eax, %esi, bpp), %esi ; \
  24. ; \
  25. - movl B_WIDTH, %ecx /* x loop counter */ ; \
  26. - movl BMP_SEG(%edx), %ds /* load data segment */ ; \
  27. + mov B_WIDTH, %ecx /* x loop counter */ ; \
  28. + mov BMP_SEG(%edx), %ds /* load data segment */ ; \
  29. code /* do the transfer */ ; \
  30. ; \
  31. - movl %ebx, %ds /* restore data segment */ ; \
  32. + mov %ebx, %ds /* restore data segment */ ; \
  33. incl B_SOURCE_Y ; \
  34. incl B_DEST_Y ; \
  35. decl B_HEIGHT ; \
  36. diff -ruN allegro-4.1.17/src/i386/iblit16.s allegro-4.1.17-new/src/i386/iblit16.s
  37. --- allegro-4.1.17/src/i386/iblit16.s 2003-07-16 21:43:28.000000000 +0200
  38. +++ allegro-4.1.17-new/src/i386/iblit16.s 2005-05-21 09:46:43.000000000 +0200
  39. @@ -43,7 +43,7 @@
  40. movl ARG1, %edx /* edx = bmp */
  41. movl BMP_CT(%edx), %ebx /* line to start at */
  42. - movl BMP_SEG(%edx), %es /* select segment */
  43. + mov BMP_SEG(%edx), %es /* select segment */
  44. movl BMP_CR(%edx), %esi /* width to clear */
  45. subl BMP_CL(%edx), %esi
  46. @@ -311,7 +311,7 @@
  47. movl B_DEST, %edx
  48. movl %ds, %ebx /* save data segment selector */
  49. - movl BMP_SEG(%edx), %es /* load destination segment */
  50. + mov BMP_SEG(%edx), %es /* load destination segment */
  51. #ifdef ALLEGRO_MMX /* only use MMX if the compiler supports it */
  52. @@ -484,7 +484,7 @@
  53. movl B_DEST, %edx
  54. movl %ds, %ebx /* save data segment selector */
  55. - movl BMP_SEG(%edx), %es /* load destination segment */
  56. + mov BMP_SEG(%edx), %es /* load destination segment */
  57. _align_
  58. blit_backwards_loop:
  59. @@ -501,7 +501,7 @@
  60. leal (%eax, %esi, 2), %esi
  61. movl B_WIDTH, %ecx /* x loop counter */
  62. - movl BMP_SEG(%edx), %ds /* load data segment */
  63. + mov BMP_SEG(%edx), %ds /* load data segment */
  64. std /* backwards */
  65. rep ; movsw /* copy the line */
  66. @@ -551,7 +551,7 @@
  67. movl B_DEST, %edx
  68. movl %ds, %ebx
  69. - movl BMP_SEG(%edx), %es
  70. + mov BMP_SEG(%edx), %es
  71. cld
  72. movl B_SOURCE, %edx
  73. diff -ruN allegro-4.1.17/src/i386/iblit24.s allegro-4.1.17-new/src/i386/iblit24.s
  74. --- allegro-4.1.17/src/i386/iblit24.s 2002-07-13 00:51:15.000000000 +0200
  75. +++ allegro-4.1.17-new/src/i386/iblit24.s 2005-05-21 09:51:52.000000000 +0200
  76. @@ -39,7 +39,7 @@
  77. movl ARG1, %edx /* edx = bmp */
  78. movl BMP_CT(%edx), %ebx /* line to start at */
  79. - movl BMP_SEG(%edx), %es /* select segment */
  80. + mov BMP_SEG(%edx), %es /* select segment */
  81. cld
  82. @@ -123,7 +123,7 @@
  83. pushl %es
  84. movl B_DEST, %edx
  85. - movl BMP_SEG(%edx), %es /* load destination segment */
  86. + mov BMP_SEG(%edx), %es /* load destination segment */
  87. movl B_DEST_X, %edi
  88. leal (%edi, %edi, 2), %edi
  89. movl %edi, B_DEST_X
  90. @@ -149,7 +149,7 @@
  91. READ_BANK() /* select bank */
  92. addl %eax, %esi /* esi = eax+3*esi */
  93. movl B_WIDTH, %ecx /* x loop counter */
  94. - movl BMP_SEG(%edx), %ds /* load data segment */
  95. + mov BMP_SEG(%edx), %ds /* load data segment */
  96. shrl $1, %ecx
  97. jnc notcarry1
  98. movsb
  99. @@ -218,7 +218,7 @@
  100. movl B_DEST, %edx
  101. movl %ds, %ebx /* save data segment selector */
  102. - movl BMP_SEG(%edx), %es /* load destination segment */
  103. + mov BMP_SEG(%edx), %es /* load destination segment */
  104. _align_
  105. blit_backwards_loop:
  106. @@ -233,7 +233,7 @@
  107. READ_BANK() /* select bank */
  108. addl %eax, %esi /* esi = eax+3*esi */
  109. movl B_WIDTH, %ecx /* x loop counter */
  110. - movl BMP_SEG(%edx), %ds /* load data segment */
  111. + mov BMP_SEG(%edx), %ds /* load data segment */
  112. std /* backwards */
  113. shrl $1, %ecx
  114. jnc not_carry1
  115. @@ -289,7 +289,7 @@
  116. movl B_DEST, %edx
  117. movl %ds, %ebx
  118. - movl BMP_SEG(%edx), %es
  119. + mov BMP_SEG(%edx), %es
  120. cld
  121. movl B_DEST_X, %eax
  122. @@ -307,7 +307,7 @@
  123. WRITE_BANK() /* select bank */
  124. addl %eax, %edi
  125. movl B_SOURCE,%edx
  126. - movl BMP_SEG(%edx), %ds /* load data segment */
  127. + mov BMP_SEG(%edx), %ds /* load data segment */
  128. movl B_SOURCE_Y, %eax /* line number */
  129. movl B_SOURCE_X, %esi /* x offset */
  130. READ_BANK() /* select bank */
  131. diff -ruN allegro-4.1.17/src/i386/iblit32.s allegro-4.1.17-new/src/i386/iblit32.s
  132. --- allegro-4.1.17/src/i386/iblit32.s 2003-07-16 21:43:28.000000000 +0200
  133. +++ allegro-4.1.17-new/src/i386/iblit32.s 2005-05-21 09:55:22.000000000 +0200
  134. @@ -39,7 +39,7 @@
  135. movl ARG1, %edx /* edx = bmp */
  136. movl BMP_CT(%edx), %ebx /* line to start at */
  137. - movl BMP_SEG(%edx), %es /* select segment */
  138. + mov BMP_SEG(%edx), %es /* select segment */
  139. movl BMP_CR(%edx), %esi /* width to clear */
  140. subl BMP_CL(%edx), %esi
  141. @@ -88,7 +88,7 @@
  142. movl B_DEST, %edx
  143. movl %ds, %ebx /* save data segment selector */
  144. - movl BMP_SEG(%edx), %es /* load destination segment */
  145. + mov BMP_SEG(%edx), %es /* load destination segment */
  146. cld /* for forward copy */
  147. _align_
  148. @@ -138,7 +138,7 @@
  149. movl B_DEST, %edx
  150. movl %ds, %ebx /* save data segment selector */
  151. - movl BMP_SEG(%edx), %es /* load destination segment */
  152. + mov BMP_SEG(%edx), %es /* load destination segment */
  153. _align_
  154. blit_backwards_loop:
  155. @@ -155,7 +155,7 @@
  156. leal (%eax, %esi, 4), %esi
  157. movl B_WIDTH, %ecx /* x loop counter */
  158. - movl BMP_SEG(%edx), %ds /* load data segment */
  159. + mov BMP_SEG(%edx), %ds /* load data segment */
  160. std /* backwards */
  161. rep ; movsl /* copy the line */
  162. @@ -202,7 +202,7 @@
  163. movl B_DEST, %edx
  164. movl %ds, %ebx
  165. - movl BMP_SEG(%edx), %es
  166. + mov BMP_SEG(%edx), %es
  167. cld
  168. #ifdef ALLEGRO_SSE /* Use SSE if the compiler supports it */
  169. diff -ruN allegro-4.1.17/src/i386/iblit8.s allegro-4.1.17-new/src/i386/iblit8.s
  170. --- allegro-4.1.17/src/i386/iblit8.s 2003-07-16 21:43:28.000000000 +0200
  171. +++ allegro-4.1.17-new/src/i386/iblit8.s 2005-05-21 09:56:40.000000000 +0200
  172. @@ -41,7 +41,7 @@
  173. movl ARG1, %edx /* edx = bmp */
  174. pushl %es
  175. - movl BMP_SEG(%edx), %es /* select segment */
  176. + mov BMP_SEG(%edx), %es /* select segment */
  177. movl BMP_CT(%edx), %ebx /* line to start at */
  178. @@ -315,7 +315,7 @@
  179. movl B_DEST, %edx
  180. movl %ds, %ebx /* save data segment selector */
  181. - movl BMP_SEG(%edx), %es /* load destination segment */
  182. + mov BMP_SEG(%edx), %es /* load destination segment */
  183. cld /* for forward copy */
  184. shrl $1, B_WIDTH /* halve counter for word copies */
  185. @@ -406,7 +406,7 @@
  186. movl B_DEST, %edx
  187. movl %ds, %ebx /* save data segment selector */
  188. - movl BMP_SEG(%edx), %es /* load destination segment */
  189. + mov BMP_SEG(%edx), %es /* load destination segment */
  190. movl B_SOURCE_Y, %eax /* if different line -> fast dword blit */
  191. cmpl B_DEST_Y, %eax
  192. @@ -433,7 +433,7 @@
  193. std /* backwards */
  194. movl B_WIDTH, %ecx /* x loop counter */
  195. - movl BMP_SEG(%edx), %ds /* load data segment */
  196. + mov BMP_SEG(%edx), %ds /* load data segment */
  197. rep ; movsb /* copy the line */
  198. movl %ebx, %ds /* restore data segment */
  199. @@ -460,7 +460,7 @@
  200. std /* backwards */
  201. movl B_WIDTH, %eax /* x loop counter */
  202. - movl BMP_SEG(%edx), %ds /* load data segment */
  203. + mov BMP_SEG(%edx), %ds /* load data segment */
  204. movl %eax, %ecx
  205. andl $3, %ecx /* copy bytes */
  206. @@ -517,7 +517,7 @@
  207. movl B_DEST, %edx
  208. movl %ds, %ebx
  209. - movl BMP_SEG(%edx), %es
  210. + mov BMP_SEG(%edx), %es
  211. cld
  212. #ifdef ALLEGRO_SSE /* Use SSE if the compiler supports it */
  213. diff -ruN allegro-4.1.17/src/misc/modexgfx.s allegro-4.1.17-new/src/misc/modexgfx.s
  214. --- allegro-4.1.17/src/misc/modexgfx.s 2003-07-16 21:43:28.000000000 +0200
  215. +++ allegro-4.1.17-new/src/misc/modexgfx.s 2005-05-21 09:57:18.000000000 +0200
  216. @@ -1230,7 +1230,7 @@
  217. pushw %es
  218. movl DEST, %edx /* load segment selector */
  219. - movl BMP_SEG(%edx), %es
  220. + mov BMP_SEG(%edx), %es
  221. _align_
  222. x_blit_forward_y_loop:
  223. @@ -1335,7 +1335,7 @@
  224. addl %eax, DEST_X
  225. movl DEST, %edx /* load segment selector */
  226. - movl BMP_SEG(%edx), %es
  227. + mov BMP_SEG(%edx), %es
  228. _align_
  229. x_blit_backward_y_loop: