# HG changeset patch # User Adam Kaminski # Date 1615156207 18000 # Sun Mar 07 17:30:07 2021 -0500 # Node ID c078e6238f5abc260e2c49d6768e96d8f519ec41 # Parent dd9c603b0a0885eca63884bf44d96dd092476020 Changed the way some comments were made within the assembly files, these caused compiler errors in some cases. diff -r dd9c603b0a08 -r c078e6238f5a src/asm_ia32/tmap.asm --- a/src/asm_ia32/tmap.asm Sun Mar 07 17:17:03 2021 -0500 +++ b/src/asm_ia32/tmap.asm Sun Mar 07 17:30:07 2021 -0500 @@ -1778,7 +1778,8 @@ GLOBAL R_SetupShadedCol GLOBAL @R_SetupShadedCol@0 -# Patch the values of dc_colormap and dc_color into the shaded column drawer. +; [AK] This comment should start with a ';' instead of a '#' to avoid compiler errors. +; Patch the values of dc_colormap and dc_color into the shaded column drawer. R_SetupShadedCol: @R_SetupShadedCol@0: @@ -1803,8 +1804,9 @@ GLOBAL R_SetupAddCol GLOBAL @R_SetupAddCol@0 -# Patch the values of dc_colormap, dc_srcblend, and dc_destblend into the -# unclamped adding column drawer. +; [AK] This comment should start with a ';' instead of a '#' to avoid compiler errors. +; Patch the values of dc_colormap, dc_srcblend, and dc_destblend into the +; unclamped adding column drawer. R_SetupAddCol: @R_SetupAddCol@0: @@ -1835,8 +1837,9 @@ GLOBAL R_SetupAddClampCol GLOBAL @R_SetupAddClampCol@0 -# Patch the values of dc_colormap, dc_srcblend, and dc_destblend into the -# add with clamping column drawer. +; [AK] This comment should start with a ';' instead of a '#' to avoid compiler errors. +; Patch the values of dc_colormap, dc_srcblend, and dc_destblend into the +; add with clamping column drawer. R_SetupAddClampCol: @R_SetupAddClampCol@0: diff -r dd9c603b0a08 -r c078e6238f5a src/asm_x86_64/tmap3.s --- a/src/asm_x86_64/tmap3.s Sun Mar 07 17:17:03 2021 -0500 +++ b/src/asm_x86_64/tmap3.s Sun Mar 07 17:30:07 2021 -0500 @@ -1,4 +1,5 @@ -#%include "valgrind.inc" +; [AK] This comment should start with a ';' instead of a '#' to avoid compiler errors. +;%include "valgrind.inc" .section .text @@ -7,7 +8,8 @@ movl dc_pitch(%rip), %ecx movl %ecx, pm+3(%rip) movl %ecx, vltpitch+3(%rip) -# selfmod pm, vltpitch+6 +; [AK] This comment should start with a ';' instead of a '#' to avoid compiler errors. +; selfmod pm, vltpitch+6 ret .align 16 @@ -17,7 +19,8 @@ movb %dil, shifter2+2(%rip) movb %dil, shifter3+2(%rip) movb %dil, shifter4+2(%rip) -# selfmod shifter1, shifter4+3 +; [AK] This comment should start with a ';' instead of a '#' to avoid compiler errors. +; selfmod shifter1, shifter4+3 ret .align 16 @@ -35,21 +38,24 @@ push %r12 push %rbp push %rsi - subq $8, %rsp # Does the stack need to be 16-byte aligned for Linux? +; [AK] The comment below should start with a ';' to avoid compiler errors. + subq $8, %rsp ; Does the stack need to be 16-byte aligned for Linux? .cfi_adjust_cfa_offset 8 -# rax = bufplce base address -# rbx = -# rcx = offset from rdi/count (negative) -# edx/rdx = scratch -# rdi = bottom of columns to write to -# r8d-r11d = column offsets -# r12-r15 = palookupoffse[0] - palookupoffse[4] +; [AK] These comments should start with a ';' instead of a '#' to avoid compiler errors. +; rax = bufplce base address +; rbx = +; rcx = offset from rdi/count (negative) +; edx/rdx = scratch +; rdi = bottom of columns to write to +; r8d-r11d = column offsets +; r12-r15 = palookupoffse[0] - palookupoffse[4] movl dc_count(%rip), %ecx movq dc_dest(%rip), %rdi testl %ecx, %ecx - jle vltepilog # count must be positive +; [AK] The comment below should start with a ';' to avoid compiler errors. + jle vltepilog ; count must be positive movq bufplce(%rip), %rax movq bufplce+8(%rip), %r8 @@ -85,7 +91,8 @@ movl vplce+4(%rip), %r9d movl vplce+8(%rip), %r10d movl vplce+12(%rip), %r11d -# selfmod loopit, vltepilog +; [AK] This comment should start with a ';' instead of a '#' to avoid compiler errors. +; selfmod loopit, vltepilog jmp loopit .align 16