From 624468cd401cc1ac0dd70c746301e0788a597759 Mon Sep 17 00:00:00 2001 From: Hiroshi Yamauchi Date: Mon, 31 Mar 2014 15:14:47 -0700 Subject: Make the support code for read barriers a bit more general. Add an option for Baker in addition to Brooks. Bug: 12687968 Change-Id: I8a31db817ff6686c72951b6534f588228e270b11 --- runtime/asm_support.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/asm_support.h') diff --git a/runtime/asm_support.h b/runtime/asm_support.h index 0c1a72a..8ef407d 100644 --- a/runtime/asm_support.h +++ b/runtime/asm_support.h @@ -17,7 +17,7 @@ #ifndef ART_RUNTIME_ASM_SUPPORT_H_ #define ART_RUNTIME_ASM_SUPPORT_H_ -#include "brooks_pointer.h" +#include "read_barrier.h" // Value loaded into rSUSPEND for quick. When this value is counted down to zero we do a suspend // check. @@ -27,7 +27,7 @@ #define CLASS_OFFSET 0 #define LOCK_WORD_OFFSET 4 -#ifndef USE_BROOKS_POINTER +#ifndef USE_BAKER_OR_BROOKS_READ_BARRIER // Offsets within java.lang.Class. #define CLASS_COMPONENT_TYPE_OFFSET 12 -- cgit v1.1