wok annotate memtest/stuff/memtest86+-5.01-setup.patch @ rev 19179
sc-im: fix build
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Sat Jun 04 10:10:15 2016 +0200 (2016-06-04) |
| parents | 882e8f79c200 |
| children | 4ba626e0a6d2 |
| rev | line source |
|---|---|
| pascal@19171 | 1 --- memtest86+-5.01/setup.S |
| pascal@19171 | 2 +++ memtest86+-5.01/setup.S |
| pascal@19171 | 3 @@ -27,11 +27,10 @@ |
| pascal@19171 | 4 #ljmp $INITSEG, $(reload - start + 0x200) |
| pascal@19171 | 5 reload: |
| pascal@19171 | 6 movw $INITSEG, %ax |
| pascal@19171 | 7 - movw %ax, %ds |
| pascal@19171 | 8 movw %ax, %es |
| pascal@19171 | 9 movw %ax, %fs |
| pascal@19171 | 10 movw %ax, %ss # reset the stack to INITSEG:0x4000-12. |
| pascal@19171 | 11 - movw %dx, %sp |
| pascal@19171 | 12 + movw $0x4000-12, %sp |
| pascal@19171 | 13 push %cs |
| pascal@19171 | 14 pop %ds |
| pascal@19171 | 15 lidt idt_48 - start # load idt with 0,0 |
| pascal@19179 | 16 @@ -50,13 +49,13 @@ |
| pascal@19179 | 17 jz alt_a20_done |
| pascal@19179 | 18 |
| pascal@19179 | 19 /* set or clear bit1, the ALT_A20_GATE bit */ |
| pascal@19179 | 20 - movb 4(%esp), %ah |
| pascal@19179 | 21 - testb %ah, %ah |
| pascal@19179 | 22 - jz alt_a20_cont1 |
| pascal@19179 | 23 + //movb 4(%esp), %ah |
| pascal@19179 | 24 + //testb %ah, %ah |
| pascal@19179 | 25 + //jz alt_a20_cont1 |
| pascal@19179 | 26 orb $2, %al |
| pascal@19179 | 27 - jmp alt_a20_cont2 |
| pascal@19179 | 28 + //jmp alt_a20_cont2 |
| pascal@19179 | 29 alt_a20_cont1: |
| pascal@19179 | 30 - and $0xfd, %al |
| pascal@19179 | 31 + //and $0xfd, %al |
| pascal@19179 | 32 |
| pascal@19179 | 33 /* clear the INIT_NOW bit; don't accidently reset the machine */ |
| pascal@19179 | 34 alt_a20_cont2: |
| pascal@19171 | 35 @@ -87,8 +86,8 @@ |
| pascal@19171 | 36 movw $KERNEL_DS, %ax |
| pascal@19171 | 37 movw %ax, %ds |
| pascal@19171 | 38 movw %ax, %es |
| pascal@19171 | 39 - movw %ax, %ss |
| pascal@19171 | 40 movw %ax, %fs |
| pascal@19171 | 41 + movw %ax, %ss |
| pascal@19171 | 42 movw %ax, %gs |
| pascal@19171 | 43 |
| pascal@19171 | 44 data32 ljmp $KERNEL_CS, $(TSTLOAD <<4) # jmp offset 2000 of segment 0x10 (cs) |