src/sys/arch/i386/i386/locore.S - diff

Return to locore.S CVS log

Up to [cvs.NetBSD.org] / src / sys / arch / i386 / i386

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

-version 1.135.2.2, 2016/11/04 14:49:01
+version 1.136, 2016/07/25 15:18:41
 Line 270  __KERNEL_RCSID(0, "$NetBSD$");
 Line 270  __KERNEL_RCSID(0, "$NetBSD$");
 Line 270  __KERNEL_RCSID(0, "$NetBSD$");
   */
          .data
+         .globl  _C_LABEL(lapic_tpr)
  #if NLAPIC > 0
          .align  PAGE_SIZE
          .globl  _C_LABEL(local_apic)
+         .globl  _C_LABEL(lapic_id)
          .type   _C_LABEL(local_apic), @object
  LABEL(local_apic)
-         .space  PAGE_SIZE
+         .space  LAPIC_ID
  END(local_apic)
+         .type   _C_LABEL(lapic_id), @object
+ LABEL(lapic_id)
+         .long   0x00000000
+         .space  LAPIC_TPRI-(LAPIC_ID+4)
+ END(lapic_id)
+         .type   _C_LABEL(lapic_tpr), @object
+ LABEL(lapic_tpr)
+         .space  LAPIC_PPRI-LAPIC_TPRI
+ END(lapic_tpr)
+         .type   _C_LABEL(lapic_ppr), @object
+ _C_LABEL(lapic_ppr):
+         .space  LAPIC_ISR-LAPIC_PPRI
+ END(lapic_ppr)
+         .type   _C_LABEL(lapic_isr), @object
+ _C_LABEL(lapic_isr):
+         .space  PAGE_SIZE-LAPIC_ISR
+ END(lapic_isr)
+ #else
+         .type   _C_LABEL(lapic_tpr), @object
+ LABEL(lapic_tpr)
+         .long 0
+ END(lapic_tpr)
  #endif
          .globl  _C_LABEL(tablesize)