diff options
| author | rsc <rsc> | 2006-09-06 17:04:06 +0000 |
|---|---|---|
| committer | rsc <rsc> | 2006-09-06 17:04:06 +0000 |
| commit | a650c606fecc7e3938345e2bc52050a9ea725e7a (patch) | |
| tree | 3bd2cfcd215f7ad4abdb087cdfe91f608c7f0801 /asm.h | |
| parent | 45854caa93eecc3f80d34940b7cf6a400b640d69 (diff) | |
| download | xv6-labs-a650c606fecc7e3938345e2bc52050a9ea725e7a.tar.gz xv6-labs-a650c606fecc7e3938345e2bc52050a9ea725e7a.tar.bz2 xv6-labs-a650c606fecc7e3938345e2bc52050a9ea725e7a.zip | |
spacing fixes: no tabs, 2-space indents (for rtm)
Diffstat (limited to 'asm.h')
| -rw-r--r-- | asm.h | 27 |
1 files changed, 14 insertions, 13 deletions
@@ -2,17 +2,18 @@ // macros to create x86 segments from assembler // -#define SEG_NULLASM \ - .word 0, 0; \ - .byte 0, 0, 0, 0 -#define SEG_ASM(type,base,lim) \ - .word (((lim) >> 12) & 0xffff), ((base) & 0xffff); \ - .byte (((base) >> 16) & 0xff), (0x90 | (type)), \ - (0xC0 | (((lim) >> 28) & 0xf)), (((base) >> 24) & 0xff) +#define SEG_NULLASM \ + .word 0, 0; \ + .byte 0, 0, 0, 0 -#define STA_X 0x8 // Executable segment -#define STA_E 0x4 // Expand down (non-executable segments) -#define STA_C 0x4 // Conforming code segment (executable only) -#define STA_W 0x2 // Writeable (non-executable segments) -#define STA_R 0x2 // Readable (executable segments) -#define STA_A 0x1 // Accessed +#define SEG_ASM(type,base,lim) \ + .word (((lim) >> 12) & 0xffff), ((base) & 0xffff); \ + .byte (((base) >> 16) & 0xff), (0x90 | (type)), \ + (0xC0 | (((lim) >> 28) & 0xf)), (((base) >> 24) & 0xff) + +#define STA_X 0x8 // Executable segment +#define STA_E 0x4 // Expand down (non-executable segments) +#define STA_C 0x4 // Conforming code segment (executable only) +#define STA_W 0x2 // Writeable (non-executable segments) +#define STA_R 0x2 // Readable (executable segments) +#define STA_A 0x1 // Accessed |