Changeset 563b538 in mainline

Timestamp:

2011-03-30T15:39:07Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

917a8c8

Parents:

d6b81941

Message:

never use top-level conjunction in assertions, always write two assertions

File:

• kernel/generic/src/mm/backend_elf.c (modified) (1 diff)

kernel/generic/src/mm/backend_elf.c

@@ -92 +92 @@
                 return AS_PF_FAULT;
 
-        ASSERT((addr >= ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE)) &&
-            (addr < entry->p_vaddr + entry->p_memsz));
+        ASSERT(addr >= ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE));
+        ASSERT(addr < entry->p_vaddr + entry->p_memsz);
         i = (addr - ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE)) >> PAGE_WIDTH;
         base = (uintptr_t)