diff options
| author | kaashoek <kaashoek> | 2006-09-03 15:39:29 +0000 |
|---|---|---|
| committer | kaashoek <kaashoek> | 2006-09-03 15:39:29 +0000 |
| commit | 7abf49d2f22af633f2fb3546f9f9fd818cef25df (patch) | |
| tree | e2c8e235d2d00240a9910e26ee527ae3dee6de0f /asm.h | |
| parent | 801affcd147606873b10db04c9fbf80dede969f6 (diff) | |
| download | xv6-labs-7abf49d2f22af633f2fb3546f9f9fd818cef25df.tar.gz xv6-labs-7abf49d2f22af633f2fb3546f9f9fd818cef25df.tar.bz2 xv6-labs-7abf49d2f22af633f2fb3546f9f9fd818cef25df.zip | |
remove duplication
don't use the same name for two different pieces of code
Diffstat (limited to 'asm.h')
| -rw-r--r-- | asm.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2,10 +2,10 @@ // macros to create x86 segments from assembler // -#define SEG_NULL \ +#define SEG_NULLASM \ .word 0, 0; \ .byte 0, 0, 0, 0 -#define SEG(type,base,lim) \ +#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) |