Change comments to C-style to not interfer with preprocessor definitions

This commit is contained in:
2014-12-05 00:40:39 +01:00
parent f4bc62dd89
commit 340aa29d4a
+97 -97
View File
@@ -2,24 +2,24 @@
#define HEIGHT 40
.bss
# Array of longs representing the game field
// Array of longs representing the game field
.align 4
world: .space WIDTH*HEIGHT*4
.data
# Current length of the snake
// Current length of the snake
snakeLength: .long 0
# Snake position
// Snake position
snakePosX: .long WIDTH / 2
snakePosY: .long HEIGHT / 2
# Snake direction
// Snake direction
snakeDirX: .long 1
snakeDirY: .long 0
# Number of apples
// Number of apples
numApples: .long 0
# Optional score-keeping
// Optional score-keeping
score: .long 0
# Utility strings
// Utility strings
snibbles: .ascii "NIBBLES"
snibbles_end:
sgameover: .string " Game over! Score: %i "
@@ -32,19 +32,19 @@ stringtest: .string "> %i %i %c\n"
.text
.global start_game
start_game:
# snakeLength = len
// snakeLength = len
movl 4(%esp), %eax
movl %eax, snakeLength
# numApples = n_apples
// numApples = n_apples
movl 8(%esp), %eax
movl %eax, numApples
pushl %ebx
pushl %edi
# Call nib_init
// Call nib_init
call nib_init
# Seed randomness
// Seed randomness
pushl $0
call time
addl $4, %esp
@@ -52,22 +52,22 @@ start_game:
call srand
addl $4, %esp
# Print our arguments
#pushl numApples
#pushl snakeLength
#pushl $string1
#call printf
#addl $4*3, %esp
// Print our arguments
//pushl numApples
//pushl snakeLength
//pushl $string1
//call printf
//addl $4*3, %esp
# Print worm position
#pushl snakePosY
#pushl snakePosX
#pushl $string2
#call printf
#addl $4*3, %esp
// Print worm position
//pushl snakePosY
//pushl snakePosX
//pushl $string2
//call printf
//addl $4*3, %esp
# Initialize the snake array
# Set every cell to a time value greater than the snake length
// Initialize the snake array
// Set every cell to a time value greater than the snake length
movl $world, %edi
movl snakeLength, %eax
movl $WIDTH*HEIGHT, %ebx
@@ -78,7 +78,7 @@ start_game:
cmpl %ebx, %ecx
jl 1b
# Spawn initial apples
// Spawn initial apples
movl numApples, %ecx
1:
pushl %ecx
@@ -86,9 +86,9 @@ start_game:
popl %ecx
loop 1b
# Loop forever
// Loop forever
loop:
# Sleep for a while
// Sleep for a while
pushl $250*1000
pushl %ecx
call usleep
@@ -100,49 +100,49 @@ loop:
popl %ebx
ret
# Update stuff
// Update stuff
tick:
movl $world, %edi
# Increment cell times
// Increment cell times
movl snakeLength, %ebx
xorl %ecx, %ecx
1:
movl (%edi, %ecx, 4), %eax
# If the value is negative it's an apple we don't want to disappear
// If the value is negative it's an apple we don't want to disappear
test %eax, %eax
js 2f
# No need to increment if it's already greater than snakeLength
// No need to increment if it's already greater than snakeLength
cmpl %ebx, %eax
jg 2f
# Increment the cell value
// Increment the cell value
incl %eax
movl %eax, (%edi, %ecx, 4)
2: incl %ecx # Loop increment
2: incl %ecx // Loop increment
cmpl $WIDTH*HEIGHT, %ecx
jne 1b
# Input
// Input
call nib_poll_kbd
# Down
// Down
movl $258, %ebx
cmpl %eax, %ebx
jne 1f
movl $0, snakeDirX
movl $1, snakeDirY
1: # Up
1: // Up
movl $259, %ebx
cmpl %eax, %ebx
jne 1f
movl $0, snakeDirX
movl $-1, snakeDirY
1: # Left
1: // Left
movl $260, %ebx
cmpl %eax, %ebx
jne 1f
movl $-1, snakeDirX
movl $0, snakeDirY
1: # Right
1: // Right
movl $261, %ebx
cmpl %eax, %ebx
jne 1f
@@ -150,95 +150,95 @@ tick:
movl $0, snakeDirY
1:
# Move snake
# snakePosX = (snakePosX + snakeDirY + WIDTH) % WIDTH
// Move snake
// snakePosX = (snakePosX + snakeDirY + WIDTH) % WIDTH
movl snakePosX, %eax
movl snakeDirX, %ebx
addl %ebx, %eax
addl $WIDTH, %eax # For modulo wrap-around
addl $WIDTH, %eax // For modulo wrap-around
xorl %edx, %edx
movl $WIDTH, %ecx
divl %ecx
mov %edx, snakePosX
# snakePosY = (snakePosY + snakeDirY + HEIGHT) % HEIGHT
// snakePosY = (snakePosY + snakeDirY + HEIGHT) % HEIGHT
movl snakePosY, %eax
movl snakeDirY, %ebx
addl %ebx, %eax
addl $HEIGHT, %eax # For modulo wrap-around
addl $HEIGHT, %eax // For modulo wrap-around
xorl %edx, %edx
movl $HEIGHT, %ecx
divl %ecx
mov %edx, snakePosY
# Get value at head position
// Get value at head position
movl snakePosY, %eax
movl $WIDTH, %edx
mull %edx
addl snakePosX, %eax
movl (%edi, %eax, 4), %edx
# Collision with apple if negative
// Collision with apple if negative
test %edx, %edx
js 1f
# No need to increment if it's already greater than snakeLength
// No need to increment if it's already greater than snakeLength
movl snakeLength, %ebx
cmpl %ebx, %edx
jg 2f
# End the game when the snake collides with itself
// End the game when the snake collides with itself
jmp gameOver
1: # Spawn a new apple
1: // Spawn a new apple
pushl %edi
pushl %eax
call spawnApple
popl %eax
popl %edi
# Extend the snake!
// Extend the snake!
incl snakeLength
2:
# Set time value to 0 at snake head position
# i = x + y * WIDTH
# %edi = %ebx + %ecx * $WIDTH
// Set time value to 0 at snake head position
// i = x + y * WIDTH
// %edi = %ebx + %ecx * $WIDTH
movl $0, (%edi, %eax, 4)
jmp draw
#jmp debug_draw
//jmp debug_draw
# Draw stuff
// Draw stuff
draw:
# Loop Y
// Loop Y
movl $HEIGHT, %ecx
1:
# Loop X
// Loop X
movl $WIDTH, %ebx
2:
# Save loop registers
// Save loop registers
pushl %ecx
pushl %ebx
subl $1, %ecx
subl $1, %ebx
# Call nib_put_scr
// Call nib_put_scr
# i = x + y * WIDTH
# %eax = %ebx + %ecx * $WIDTH
// i = x + y * WIDTH
// %eax = %ebx + %ecx * $WIDTH
movl %ecx, %eax
movl $WIDTH, %edx
mull %edx
addl %ebx, %eax
# Fetch the value of the cell
// Fetch the value of the cell
movl $world, %edi
movl (%edi, %eax, 4), %eax
# Compare with the snake length
// Compare with the snake length
cmpl snakeLength, %eax
# If the value is negative, it's an apple
// If the value is negative, it's an apple
test %eax, %eax
js 4f
# If it's greater or equal to snakeLength, it's empty
// If it's greater or equal to snakeLength, it's empty
cmpl snakeLength, %eax
jge 3f
# Else, it's part of the snake
// Else, it's part of the snake
pushl $'@'
jmp 5f
3: pushl $' '
@@ -246,89 +246,89 @@ draw:
4: pushl $'o'
5:
movl %ecx, %eax # Y
movl %ecx, %eax // Y
pushl %eax
movl %ebx, %eax # X
movl %ebx, %eax // X
pushl %eax
call nib_put_scr
addl $4*3, %esp
# Restore loop registers
// Restore loop registers
popl %ebx
popl %ecx
decl %ebx # Decrement X
jnz 2b # End of X loop
loop 1b # End of Y loop
decl %ebx // Decrement X
jnz 2b // End of X loop
loop 1b // End of Y loop
jmp loop
# Debug drawing
// Debug drawing
debug_draw:
# Loop Y
// Loop Y
movl $HEIGHT, %ecx
1:
# Loop X
// Loop X
movl $WIDTH, %ebx
2:
# Save loop registers
// Save loop registers
pushl %ecx
pushl %ebx
subl $1, %ecx
subl $1, %ebx
# Call nib_put_scr
// Call nib_put_scr
# i = x + y * WIDTH
# %edi = %ebx + %ecx * $WIDTH
// i = x + y * WIDTH
// %edi = %ebx + %ecx * $WIDTH
movl %ecx, %eax
movl $WIDTH, %edx
mull %edx
addl %ebx, %eax
# Fetch the value of the cell
// Fetch the value of the cell
movl $world, %edi
movl (%edi, %eax, 4), %eax
pushl %eax
movl %ecx, %eax # Y
movl %ecx, %eax // Y
pushl %eax
movl %ebx, %eax # X
movl %ebx, %eax // X
pushl %eax
call nib_put_scr
addl $4*3, %esp
# Restore loop registers
// Restore loop registers
popl %ebx
popl %ecx
decl %ebx # Decrement X
jnz 2b # End of X loop
loop 1b # End of Y loop
decl %ebx // Decrement X
jnz 2b // End of X loop
loop 1b // End of Y loop
jmp loop
gameOver:
# Calculate string length
// Calculate string length
movl $sgameover_end, %eax
subl $sgameover, %eax
subl $1, %eax # Discount null terminator
subl $1, %eax // Discount null terminator
# Calculate X-pos
// Calculate X-pos
movl $2, %ebx
xorl %edx, %edx
divl %ebx
negl %eax
addl $WIDTH/2, %eax
# Print game over message
// Print game over message
pushl snakeLength
pushl $sgameover
pushl %eax # X
pushl $HEIGHT/2 # Y
pushl %eax // X
pushl $HEIGHT/2 // Y
call mvprintw
add $4*3, %esp
call refresh
@@ -341,13 +341,13 @@ gameOver:
spawnApple:
pushl %ebx
# %ecx = rand() % HEIGHT
// %ecx = rand() % HEIGHT
call rand
xorl %edx, %edx
movl $HEIGHT, %ebx
divl %ebx
movl %edx, %ecx
# %ebx = rand() % WIDTH
// %ebx = rand() % WIDTH
pushl %ecx
call rand
xorl %edx, %edx
@@ -356,14 +356,14 @@ spawnApple:
movl %edx, %ebx
popl %ecx
# i = x + y * WIDTH
# %eax = %ebx + %ecx * $WIDTH
// i = x + y * WIDTH
// %eax = %ebx + %ecx * $WIDTH
movl %ecx, %eax
movl $WIDTH, %edx
mull %edx
addl %ebx, %eax
# Set the cell negative to represent an apple
// Set the cell negative to represent an apple
movl $world, %ecx
movl $-1, %edx
movl %edx, (%ecx, %eax, 4)