Attachment #281401 for bug #376867

View | Details | Raw Unified | Return to bug 376867
Collapse All | Expand All

Lines 132-138 Link Here

(-)m-old/config/autoconf.mk (-1 lines)
132	MOZ_PLAINTEXT_EDITOR_ONLY =	132	MOZ_PLAINTEXT_EDITOR_ONLY =
133	BUILD_STATIC_LIBS =	133	BUILD_STATIC_LIBS =
134	MOZ_ENABLE_LIBXUL = 1	134	MOZ_ENABLE_LIBXUL = 1
135	ENABLE_TESTS = 1
136	IBMBIDI = 1	135	IBMBIDI = 1
137	MOZ_UNIVERSALCHARDET = 1	136	MOZ_UNIVERSALCHARDET = 1
138	ACCESSIBILITY = 1	137	ACCESSIBILITY = 1

Lines 104-110 Link Here

(-)m-old/js/src/config/autoconf.mk (-1 lines)
104	INCREMENTAL_LINKER =	104	INCREMENTAL_LINKER =
105	MACOSX_DEPLOYMENT_TARGET =	105	MACOSX_DEPLOYMENT_TARGET =
106	BUILD_STATIC_LIBS =	106	BUILD_STATIC_LIBS =
107	ENABLE_TESTS = 1
108	JS_ULTRASPARC_OPTS = @JS_ULTRASPARC_OPTS@	107	JS_ULTRASPARC_OPTS = @JS_ULTRASPARC_OPTS@
109		108
110	TAR=@TAR@	109	TAR=@TAR@

Lines 1223-1232 Link Here

(-)m-old/js/src/nanojit/Assembler.cpp (-4 lines)
1223	countlir_label();	1223	countlir_label();
1224	LabelState *label = _labels.get(ins);	1224	LabelState *label = _labels.get(ins);
1225	// add profiling inc, if necessary.	1225	// add profiling inc, if necessary.
1226	verbose_only( if (_logc->lcbits & LC_FragProfile) {
1227	if (ins == _thisfrag->loopLabel)
1228	asm_inc_m32(& _thisfrag->profCount);
1229	})
1230	if (!label) {	1226	if (!label) {
1231	// label seen first, normal target of forward jump, save addr & allocator	1227	// label seen first, normal target of forward jump, save addr & allocator
1232	_labels.add(ins, _nIns, _allocator);	1228	_labels.add(ins, _nIns, _allocator);




                // really do need a page break
                verbose_only(if (_logc->lcbits & LC_Assembly) outputf("newpage %p:", pc);)
                if (_inExit)
                    codeAlloc(exitStart, exitEnd, _nIns verbose_only(, exitBytes));
                else
                    codeAlloc(codeStart, codeEnd, _nIns verbose_only(, codeBytes));
            }
            // now emit the jump, but make sure we won't need another page break.
            // we're pedantic, but not *that* pedantic.

        if (pc - bytes < top) {
            verbose_only(if (_logc->lcbits & LC_Assembly) outputf("newpage %p:", pc);)
            if (_inExit)
                codeAlloc(exitStart, exitEnd, _nIns verbose_only(, exitBytes));
            else
                codeAlloc(codeStart, codeEnd, _nIns verbose_only(, codeBytes));
            // this jump will call underrunProtect again, but since we're on a new
            // page, nothing will happen.
            JMP(pc);


    void Assembler::nativePageSetup() {
        if (!_nIns) {
            codeAlloc(codeStart, codeEnd, _nIns verbose_only(, codeBytes));
            IF_PEDANTIC( pedanticTop = _nIns; )
        }
        if (!_nExitIns) {
            codeAlloc(exitStart, exitEnd, _nExitIns verbose_only(, exitBytes));
        }
    }


Return to bug 376867

Lines 1388-1396 Link Here

(-)m-old/js/src/nanojit/NativeX64.cpp (-6 / +6 lines)
1388	// really do need a page break	1388	// really do need a page break
1389	verbose_only(if (_logc->lcbits & LC_Assembly) outputf("newpage %p:", pc);)	1389	verbose_only(if (_logc->lcbits & LC_Assembly) outputf("newpage %p:", pc);)
1390	if (_inExit)	1390	if (_inExit)
1391	codeAlloc(exitStart, exitEnd, _nIns);	1391	codeAlloc(exitStart, exitEnd, _nIns verbose_only(, exitBytes));
1392	else	1392	else
1393	codeAlloc(codeStart, codeEnd, _nIns);	1393	codeAlloc(codeStart, codeEnd, _nIns verbose_only(, codeBytes));
1394	}	1394	}
1395	// now emit the jump, but make sure we won't need another page break.	1395	// now emit the jump, but make sure we won't need another page break.
1396	// we're pedantic, but not that pedantic.	1396	// we're pedantic, but not that pedantic.
Lines 1402-1410 Link Here
1402	if (pc - bytes < top) {	1402	if (pc - bytes < top) {
1403	verbose_only(if (_logc->lcbits & LC_Assembly) outputf("newpage %p:", pc);)	1403	verbose_only(if (_logc->lcbits & LC_Assembly) outputf("newpage %p:", pc);)
1404	if (_inExit)	1404	if (_inExit)
1405	codeAlloc(exitStart, exitEnd, _nIns);	1405	codeAlloc(exitStart, exitEnd, _nIns verbose_only(, exitBytes));
1406	else	1406	else
1407	codeAlloc(codeStart, codeEnd, _nIns);	1407	codeAlloc(codeStart, codeEnd, _nIns verbose_only(, codeBytes));
1408	// this jump will call underrunProtect again, but since we're on a new	1408	// this jump will call underrunProtect again, but since we're on a new
1409	// page, nothing will happen.	1409	// page, nothing will happen.
1410	JMP(pc);	1410	JMP(pc);
Lines 1418-1428 Link Here
1418		1418
1419	void Assembler::nativePageSetup() {	1419	void Assembler::nativePageSetup() {
1420	if (!_nIns) {	1420	if (!_nIns) {
1421	codeAlloc(codeStart, codeEnd, _nIns);	1421	codeAlloc(codeStart, codeEnd, _nIns verbose_only(, codeBytes));
1422	IF_PEDANTIC( pedanticTop = _nIns; )	1422	IF_PEDANTIC( pedanticTop = _nIns; )
1423	}	1423	}
1424	if (!_nExitIns) {	1424	if (!_nExitIns) {
1425	codeAlloc(exitStart, exitEnd, _nExitIns);	1425	codeAlloc(exitStart, exitEnd, _nExitIns verbose_only(, exitBytes));
1426	}	1426	}
1427	}	1427	}
1428		1428