comparison src/cpu/x86/vm/c1_Runtime1_x86.cpp @ 12355:cefad50507d8

Merge with hs25-b53
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 10:38:03 +0200
parents b9a918201d47 f98f5d48f511
children 096c224171c4
comparison
equal deleted inserted replaced
12058:ccb4f2af2319 12355:cefad50507d8
1494 1494
1495 case load_mirror_patching_id: 1495 case load_mirror_patching_id:
1496 { StubFrame f(sasm, "load_mirror_patching", dont_gc_arguments); 1496 { StubFrame f(sasm, "load_mirror_patching", dont_gc_arguments);
1497 // we should set up register map 1497 // we should set up register map
1498 oop_maps = generate_patching(sasm, CAST_FROM_FN_PTR(address, move_mirror_patching)); 1498 oop_maps = generate_patching(sasm, CAST_FROM_FN_PTR(address, move_mirror_patching));
1499 }
1500 break;
1501
1502 case load_appendix_patching_id:
1503 { StubFrame f(sasm, "load_appendix_patching", dont_gc_arguments);
1504 // we should set up register map
1505 oop_maps = generate_patching(sasm, CAST_FROM_FN_PTR(address, move_appendix_patching));
1499 } 1506 }
1500 break; 1507 break;
1501 1508
1502 case dtrace_object_alloc_id: 1509 case dtrace_object_alloc_id:
1503 { // rax,: object 1510 { // rax,: object